Merge "Issue #2287 Fix yet another NullPointer in GFEColorBarResource" into omaha_13.5.2

Former-commit-id: 3034c7f8e4b61547abbb79134fb7fd1c059aab28
This commit is contained in:
Ron Anderson 2013-08-29 17:45:37 -05:00 committed by Gerrit Code Review
commit 1de723239f

View file

@ -691,7 +691,8 @@ public class GFEColorbarResource extends
updateColorbar(parm);
} else if (message instanceof GridDataChangedMsg) {
GridDataChangedMsg msg = (GridDataChangedMsg) message;
if (msg.getParmID().equals(currentParm.getParmID())
if (currentParm != null
&& msg.getParmID().equals(currentParm.getParmID())
&& msg.getTimeRange().contains(
currentParm.getDataManager()
.getSpatialDisplayManager()