Issue #1502 fix grid sampling unit null pointer.

Former-commit-id: 8aaef6b256 [formerly f814fd22a3] [formerly b6fb3706bb] [formerly 8aaef6b256 [formerly f814fd22a3] [formerly b6fb3706bb] [formerly 5a07b36fa4 [formerly b6fb3706bb [formerly db0a4825b8360afaada2a8f8363108464e61f474]]]]
Former-commit-id: 5a07b36fa4
Former-commit-id: 0eee2239c9 [formerly 0b672c9c8c] [formerly c58121817c1977071b465ef1296f92eda4eaa708 [formerly 57ef4597e8]]
Former-commit-id: 9436368c1c6f1cac5154513c84513bbb52b24b2a [formerly 77d8f4ec1d]
Former-commit-id: c67345f95a
This commit is contained in:
Ben Steffensmeier 2013-01-17 13:02:08 -06:00 committed by Steve Harris
parent aeeae8dde3
commit 27af1f6334

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();