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

CM-MERGE:OB13.5.5-11 into 14.1.2

Browse source 
Former-commit-id: fba5604613 [formerly 089b2559bb] [formerly e95ee60224] [formerly e852623f48 [formerly e95ee60224 [formerly c85d4369600bfc24405386aa71713d7f2d58b201]]]
Former-commit-id: e852623f48
Former-commit-id: e2442f94c9c8f1691bd70abcf54b5b626473d3de [formerly b745ac5926]
Former-commit-id: f07b83ce91
This commit is contained in:
Brian.Dyke 2014-05-28 08:40:56 -04:00
parent 90cf8cd426
commit 4400514725
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
View file

@ -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