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

Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2

Browse source 
Former-commit-id: ff4e52fc75 [formerly df900c3156da1ed48c512fe4b1356c4b4301ad5f]
Former-commit-id: 6f47712e32
This commit is contained in:
Brian.Dyke 2014-07-23 16:46:09 -04:00
commit bdd5b3b00b
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
View file

@ -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 * 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. * created in response to another DBInvChangeNotification so IFPServers stay in synch.
* Cleaned up commented code. * Cleaned up commented code.
* * 07/21/2014 #3415 randerso Fixed d2dGridDataPurged to not purge NetCDF databases.
* </pre> * </pre>
* *
* @author bphillip * @author bphillip
@ -1558,15 +1558,18 @@ public class GridParmManager {
} }
} }
DatabaseID satDbid = D2DSatDatabase.getDbId(siteID);
List<DatabaseID> deleted = new ArrayList<DatabaseID>(currentInventory); List<DatabaseID> deleted = new ArrayList<DatabaseID>(currentInventory);
deleted.removeAll(newInventory); 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(); Iterator<DatabaseID> iter = deleted.iterator();
while (iter.hasNext()) { while (iter.hasNext()) {
DatabaseID dbid = iter.next(); DatabaseID dbid = iter.next();
// remove satellite database and non-D2D databases from deletes // don't delete non-D2D databases
if (!dbid.getDbType().equals("D2D") || dbid.equals(satDbid)) { if (!dbid.getDbType().equals("D2D")) {
iter.remove(); iter.remove();
} else { } else {
// remove the database // 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) { if (deleted.size() > 0) {
DBInvChangeNotification changed = new DBInvChangeNotification(null, DBInvChangeNotification changed = new DBInvChangeNotification(null,
deleted, siteID); deleted, siteID);