Issue #1502 fix grid sampling unit null pointer.

Former-commit-id: b6fb3706bb [formerly db0a4825b8360afaada2a8f8363108464e61f474]
Former-commit-id: 5a07b36fa4
This commit is contained in:
Ben Steffensmeier 2013-01-17 13:02:08 -06:00 committed by Steve Harris
parent 3bfba5b771
commit 57ef4597e8

View file

@ -823,7 +823,8 @@ public abstract class AbstractGridResource<T extends AbstractResourceData>
Unit<?> unit = data.getDataUnit();
if (stylePreferences != null) {
Unit<?> styleUnit = stylePreferences.getDisplayUnits();
if (unit != null && unit.isCompatible(styleUnit)) {
if (unit != null && styleUnit != null
&& unit.isCompatible(styleUnit)) {
value = (float) unit.getConverterTo(styleUnit).convert(value);
unit = styleUnit;
unitString = stylePreferences.getDisplayUnitLabel();