From a1f3f9cd3ffeee4beec6b88767bec74fd5233326 Mon Sep 17 00:00:00 2001
From: Ron Anderson <ron.anderson@raytheon.com>
Date: Tue, 3 Nov 2015 17:42:35 -0600
Subject: [PATCH] Omaha #5061 Fix NPE in WeatherGridSlice.equals()

Change-Id: I3c0c4223306ef1cce46d0f0cdcbd912247e324d5

Former-commit-id: 545c30bbae1cc63acf1ac515e6d490a38ee2c926
---
 .../uf/common/dataplugin/gfe/slice/WeatherGridSlice.java       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/slice/WeatherGridSlice.java b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/slice/WeatherGridSlice.java
index 231a682fb4..f531e35b81 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/slice/WeatherGridSlice.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/slice/WeatherGridSlice.java
@@ -59,6 +59,7 @@ import com.raytheon.uf.common.time.TimeRange;
  *                                      debugger when trying to display the grid
  * Oct 29, 2013 2476       njensen      Updated getNumpy() and added getKeyList()
  * Apr 23, 2015 4259       njensen      Updated for new JEP API
+ * Nov 03, 2015 5061       randerso     Fixed null pointer in equals()
  * 
  * </pre>
  * 
@@ -231,6 +232,8 @@ public class WeatherGridSlice extends AbstractGridSlice {
                 return true;
             }
             return false;
+        } else if (rhsGrid == null) {
+            return false;
         }
 
         if ((grid.getXdim() != rhsGrid.getXdim())