#520 
fixes based on FindBugs results

change == to .equals()