Mercurial > lada > lada-server
comparison src/main/java/de/intevation/lada/rest/MessprogrammService.java @ 840:2fe625c91ab3
Merged branches.
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Thu, 21 Jan 2016 09:01:57 +0100 |
| parents | 5bdd1631a451 |
| children | c2725534f08b |
comparison
equal
deleted
inserted
replaced
| 837:9dd9a3de7a61 | 840:2fe625c91ab3 |
|---|---|
| 324 Messprogramm.class) | 324 Messprogramm.class) |
| 325 ) { | 325 ) { |
| 326 return new Response(false, 699, null); | 326 return new Response(false, 699, null); |
| 327 } | 327 } |
| 328 messprogramm.setLetzteAenderung(new Timestamp(new Date().getTime())); | 328 messprogramm.setLetzteAenderung(new Timestamp(new Date().getTime())); |
| 329 messprogramm = factory.findUmweltId(messprogramm); | 329 if (messprogramm.getUmwId() == null || messprogramm.getUmwId().equals("")) { |
| 330 messprogramm = factory.findUmweltId(messprogramm); | |
| 331 } | |
| 330 Response response = defaultRepo.update(messprogramm, "land"); | 332 Response response = defaultRepo.update(messprogramm, "land"); |
| 331 Response updated = defaultRepo.getById( | 333 Response updated = defaultRepo.getById( |
| 332 Messprogramm.class, | 334 Messprogramm.class, |
| 333 ((Messprogramm)response.getData()).getId(), "land"); | 335 ((Messprogramm)response.getData()).getId(), "land"); |
| 334 return authorization.filter( | 336 return authorization.filter( |