CM-MERGE:OB13.5.5-10 into 14.1.2

Former-commit-id: 86eefc2026 [formerly 4a1b6d70c4] [formerly 89a8caddbb] [formerly 86eefc2026 [formerly 4a1b6d70c4] [formerly 89a8caddbb] [formerly ba8d7dbbb7 [formerly 89a8caddbb [formerly d57f7989982a59a546116b63a406294573844039]]]]
Former-commit-id: ba8d7dbbb7
Former-commit-id: 90cf8cd426 [formerly bb5d88be66] [formerly ddbd59370c87b39e43f9f08800b6f899c79a9f83 [formerly ebdd53742c]]
Former-commit-id: 396b767d5da65f7b066a5f0b100e2c3770df5813 [formerly 1a69aaf89a]
Former-commit-id: 7e5475923c
This commit is contained in:
Brian.Dyke 2014-05-27 13:30:35 -04:00
parent 2eca58ce8d
commit d3a6a77351

View file

@ -475,7 +475,8 @@ public class PostShef {
data.setCreationDateObj(d); data.setCreationDateObj(d);
data.setCreationDate("1970-01-01 00:00:00"); data.setCreationDate("1970-01-01 00:00:00");
} }
locId = data.getLocationId();
String key = locId + prodId + data.getObservationTime(); String key = locId + prodId + data.getObservationTime();
if (idLocations.containsKey(key)) { if (idLocations.containsKey(key)) {
postLocData = idLocations.get(key); postLocData = idLocations.get(key);