From e95ee6022467a856c009d63b68b6fe5698ed098c Mon Sep 17 00:00:00 2001 From: "Brian.Dyke" Date: Wed, 28 May 2014 08:40:56 -0400 Subject: [PATCH] CM-MERGE:OB13.5.5-11 into 14.1.2 Former-commit-id: c85d4369600bfc24405386aa71713d7f2d58b201 --- .../raytheon/edex/plugin/shef/database/PostShef.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java index ead3309e25..641bb4e620 100644 --- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java +++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java @@ -2097,9 +2097,9 @@ public class PostShef { String telem = null; String sql = null; Object[] oa = null; - + String key = locId + data.getPeTsE(); try { - if (!ingestSwitchMap.containsKey(locId)) { + if (!ingestSwitchMap.containsKey(key)) { errorMsg.append("Error getting connection to IHFS Database"); sql = "select lid, pe, dur, ts, extremum, ts_rank, ingest, ofs_input, stg2_input from IngestFilter where lid = '" + locId + "'"; @@ -2136,11 +2136,11 @@ public class PostShef { } } - ingestSwitchMap.put(locId, ingestSwitch); + ingestSwitchMap.put(key, ingestSwitch); } - matchFound = ingestSwitchMap.containsKey(locId); - ingestSwitch = ingestSwitchMap.get(locId); + matchFound = ingestSwitchMap.containsKey(key); + ingestSwitch = ingestSwitchMap.get(key); /* * if there is no ingest record for this entry, then check if the