CLDIDE-2164

possible NPE
Use constant.equals(variable)