From b79ebd050896bbb1944f3b0fd88741535c98333f Mon Sep 17 00:00:00 2001
From: Ron Anderson <ron.anderson@raytheon.com>
Date: Mon, 21 Jul 2014 12:43:21 -0500
Subject: [PATCH] Issue #3415 Fixed d2dGridDataPurged to not purge NetCDF
 databases.

Change-Id: Ie52a5b8c46d58cb39acde27f0ebdde0c42fdfa67

Former-commit-id: f3a6393b96f73c858ee98b022db43748e8c3f170 [formerly a2362b68b103c9013d615815924514ebe44be147]
Former-commit-id: 6ea726136b8a510e2130835c03ead7f5d5d94b7c
---
 .../edex/plugin/gfe/server/GridParmManager.java  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
index 7098ba4e93..4b4bd91cd2 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
@@ -122,7 +122,7 @@ import com.raytheon.uf.edex.database.purge.PurgeLogger;
  * 06/24/2014   #3317      randerso    Send DBInvChangeNotification when database is created, unless it's 
  *                                     created in response to another DBInvChangeNotification so IFPServers stay in synch.
  *                                     Cleaned up commented code.
- * 
+ * 07/21/2014   #3415      randerso    Fixed d2dGridDataPurged to not purge NetCDF databases.
  * </pre>
  * 
  * @author bphillip
@@ -1558,15 +1558,18 @@ public class GridParmManager {
             }
         }
 
-        DatabaseID satDbid = D2DSatDatabase.getDbId(siteID);
-
         List<DatabaseID> deleted = new ArrayList<DatabaseID>(currentInventory);
         deleted.removeAll(newInventory);
+
+        // don't delete NetCDF and satellite databases.
+        deleted.removeAll(NetCDFDatabaseManager.getDatabaseIds(siteID));
+        deleted.remove(D2DSatDatabase.getDbId(siteID));
+
         Iterator<DatabaseID> iter = deleted.iterator();
         while (iter.hasNext()) {
             DatabaseID dbid = iter.next();
-            // remove satellite database and non-D2D databases from deletes
-            if (!dbid.getDbType().equals("D2D") || dbid.equals(satDbid)) {
+            // don't delete non-D2D databases
+            if (!dbid.getDbType().equals("D2D")) {
                 iter.remove();
             } else {
                 // remove the database
@@ -1577,9 +1580,6 @@ public class GridParmManager {
             }
         }
 
-        // if ((added.size() > 0) || (deleted.size() > 0)) {
-        // DBInvChangeNotification changed = new DBInvChangeNotification(
-        // added, deleted, siteID);
         if (deleted.size() > 0) {
             DBInvChangeNotification changed = new DBInvChangeNotification(null,
                     deleted, siteID);