xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Omaha #5208 Fix NPE when pointset creates a level for styling.

Browse source 
Former-commit-id: 61c37c2f1882d3a0a0b0ddcfa466406811a268a1
This commit is contained in:
Ben Steffensmeier 2016-01-28 17:07:21 -06:00
parent e53d6e41c8
commit a19dad515a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cave/com.raytheon.uf.viz.pointset/src/com/raytheon/uf/viz/pointset/rsc/PointSetResource.java
View file

@ -203,7 +203,8 @@ public class PointSetResource extends
* com.raytheon.uf.common.style.level.Level exposes units
*/
Unit<?> unitsOut = result.getUpperMeasure().getUnit();
if (!unitsIn.equals(unitsOut) && unitsIn.isCompatible(unitsOut)) {
if (unitsIn != null && !unitsIn.equals(unitsOut)
&& unitsIn.isCompatible(unitsOut)) {
UnitConverter converter = unitsIn.getConverterTo(unitsOut);
double lowerValue = level.getLevelonevalue();
double upperValue = level.getLeveltwovalue();
@ -221,7 +222,8 @@ public class PointSetResource extends
* com.raytheon.uf.common.style.level.Level exposes units
*/
Unit<?> unitsOut = result.getMeasure().getUnit();
if (!unitsIn.equals(unitsOut) && unitsIn.isCompatible(unitsOut)) {
if (unitsIn != null && !unitsIn.equals(unitsOut)
&& unitsIn.isCompatible(unitsOut)) {
double value = level.getLevelonevalue();
value = unitsIn.getConverterTo(unitsOut).convert(value);
result.setValue(value);