Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-9 into 14.2.1

Former-commit-id: 575cebda84 [formerly 34c582add16be1620f400d78d2f37da8c534f71a]
Former-commit-id: 638acc2c06
This commit is contained in:
Brian.Dyke 2014-05-27 13:40:37 -04:00
commit 290b85b556

View file

@ -475,7 +475,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);