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

Merge remote-tracking branch 'remotes/origin/master_14.2.1' into master_14.2.2 CM-MERGE:14.2.1-30 into 14.2.2

Browse source 
Former-commit-id: 574246b6d4 [formerly b7ef9420e1 [formerly f2763f73cf3e5f2d9e66efa6e481dbf66f16e7da]]
Former-commit-id: b7ef9420e1
Former-commit-id: 47a37b112a
This commit is contained in:
Brian.Dyke 2014-05-28 16:25:33 -04:00
commit 9e0cf9b945
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -476,7 +476,8 @@ public class PostShef {
data.setCreationDateObj(d);
data.setCreationDate("1970-01-01 00:00:00");
}
locId = data.getLocationId();
String key = locId + prodId + data.getObservationTime();
if (idLocations.containsKey(key)) {
postLocData = idLocations.get(key);
@ -2099,9 +2100,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 + "'";
@ -2138,11 +2139,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