From 30b51f5d4d1072b3060c640b8403ba4741ace76c Mon Sep 17 00:00:00 2001
From: Ben Steffensmeier <Benjamin.P.Steffensmeier@raytheon.com>
Date: Mon, 6 May 2013 11:38:03 -0500
Subject: [PATCH] Issue #1930 Check for null in WatchesResource.

Former-commit-id: 71d03e32426476a2a3f06f73b26755f0e828b652 [formerly 3af6d471d8132ce583bf638482a6768528c30641] [formerly 721db403ad16232f75ee4b350181df3a2bd51fe6] [formerly b8cb330cd1f3a3877a12f11b61dd25145bdba1ba [formerly 721db403ad16232f75ee4b350181df3a2bd51fe6 [formerly 7feb01b219e5ace4cd7df115c20c6f4f64869126]]]
Former-commit-id: b8cb330cd1f3a3877a12f11b61dd25145bdba1ba
Former-commit-id: 76d062751a86d3a0966108d311b2bbf0dcd56abb [formerly 150b116995dd99a31565b9d1a7fb0bc5481d7fe1]
Former-commit-id: e3b56ac9759f5e5f5825094b864ad262a8769ab3
---
 .../com/raytheon/viz/warnings/rsc/WatchesResource.java    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WatchesResource.java b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WatchesResource.java
index 8cc0f60e94..ad0d7e2767 100644
--- a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WatchesResource.java
+++ b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WatchesResource.java
@@ -48,6 +48,7 @@ import com.vividsolutions.jts.geom.GeometryFactory;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Sep 27, 2012  1149       jsanchez     Refactored methods from AbstractWarningsResource into this class.
+ * May 06, 2013 1930       bsteffen    Check for null in WatchesResource.
  * 
  * </pre>
  * 
@@ -186,16 +187,13 @@ public class WatchesResource extends AbstractWWAResource {
 
         if (record.getUgczones().size() > 0) {
             setGeometry(record);
-            if (record.getGeometry() != null) {
+            if (record.getGeometry() != null && record.getPhen() != null) {
                 IShadedShape ss = target.createShadedShape(false,
                         descriptor.getGridGeometry(), false);
                 geo = (Geometry) record.getGeometry().clone();
                 JTSCompiler jtsCompiler = new JTSCompiler(ss, null,
                         this.descriptor, PointStyle.CROSS);
                 jtsCompiler.handle(geo, color);
-                if (record.getPhen() == null) {
-                    return;
-                }
                 ss.setFillPattern(FillPatterns.getGLPattern(record.getPhen()
                         .equals("TO") ? "VERTICAL" : "HORIZONTAL"));
                 ss.compile();
@@ -272,7 +270,7 @@ public class WatchesResource extends AbstractWWAResource {
                     if (createShape != null) {
                         WarningEntry entry = entryMap.get(createShape
                                 .getDataURI());
-                        if (entry != null) {
+                        if (entry != null && entry.shadedShape != null) {
                             entry.shadedShape.dispose();
                         }
                         initShape(target, createShape);