From c5b23e9f1102e8dca31cbf3af7b1e76fba46db4f Mon Sep 17 00:00:00 2001 From: Ron Anderson Date: Wed, 4 Sep 2013 08:49:13 -0500 Subject: [PATCH] Issue #2321 Fixed smartInits for D2D accumulative parameters Change-Id: I2cb802f6d0f2d5cc8364d5030a497528b5a3999e Former-commit-id: 06258f91e60521fd50c3bf10164b9a7c7905d459 [formerly d14abbec74b25a3e657dd6ede7d1344b5dfcea78] [formerly 06258f91e60521fd50c3bf10164b9a7c7905d459 [formerly d14abbec74b25a3e657dd6ede7d1344b5dfcea78] [formerly f056b3e02c1569adfa0c9daaae226fa57920c1b2 [formerly 5e168359f93663dc160e42495bbe93647c4f4fb8]]] Former-commit-id: f056b3e02c1569adfa0c9daaae226fa57920c1b2 Former-commit-id: 5aed04b3c13bd4b54d1229192dc7839641c95c51 [formerly 4314a3c499eb25261385ea5eb84cb534cf100001] Former-commit-id: 1d6e5ccc9936137d6c8edc12e750b88d22774ce2 --- .../gfe/server/notify/GfeIngestNotificationFilter.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java index fb74c8bfbb..dab1904860 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java @@ -50,8 +50,8 @@ import com.raytheon.uf.common.dataplugin.gfe.server.notify.DBInvChangeNotificati import com.raytheon.uf.common.dataplugin.gfe.server.notify.GfeNotification; import com.raytheon.uf.common.dataplugin.gfe.server.notify.GridUpdateNotification; import com.raytheon.uf.common.dataplugin.grid.GridRecord; -import com.raytheon.uf.common.dataplugin.message.DataURINotificationMessage; import com.raytheon.uf.common.dataplugin.level.Level; +import com.raytheon.uf.common.dataplugin.message.DataURINotificationMessage; import com.raytheon.uf.common.dataplugin.satellite.SatelliteRecord; import com.raytheon.uf.common.message.WsId; import com.raytheon.uf.common.serialization.SerializationUtil; @@ -81,7 +81,8 @@ import com.raytheon.uf.edex.core.EDEXUtil; * Apr 01, 2013 #1774 randerso Moved wind component checking to GfeIngestNotificaionFilter * Apr 04, 2013 #1787 randerso Added null check to prevent log spamming for parameters * not included in the parameter info file - * May 2, 2013 #1969 randerso Updated for change to DBInvChangeNotification + * May 02, 2013 #1969 randerso Updated for change to DBInvChangeNotification + * Sep 03, 2013 #2321 randerso Fixed smartInits for D2D accumulative parameters * * * @@ -240,9 +241,10 @@ public class GfeIngestNotificationFilter { initNameBuilder.append('_'); initNameBuilder.append(dbId.getModelTime()); + Date validTime = grid.getDataTime().getValidTime() + .getTime(); SmartInitRecordPK id = new SmartInitRecordPK( - initNameBuilder.toString(), grid.getDataTime() - .getValidPeriod().getStart()); + initNameBuilder.toString(), validTime); SmartInitRecord record = inits.get(id); if (record == null) {