diff src/main/java/de/intevation/lada/rest/ProbeService.java @ 840:2fe625c91ab3

Merged branches.
author Raimund Renkert <raimund.renkert@intevation.de>
date Thu, 21 Jan 2016 09:01:57 +0100
parents fa922101a462
children c2725534f08b
line wrap: on
line diff
--- a/src/main/java/de/intevation/lada/rest/ProbeService.java	Fri Jan 08 12:20:31 2016 +0100
+++ b/src/main/java/de/intevation/lada/rest/ProbeService.java	Thu Jan 21 09:01:57 2016 +0100
@@ -450,7 +450,9 @@
         if (lock.isLocked(probe)) {
             return new Response(false, 697, null);
         }
-        probe = factory.findMediaDesk(probe);
+        if (probe.getMediaDesk() == null || probe.getMediaDesk() == "") {
+            probe = factory.findMediaDesk(probe);
+        }
         Violation violation = validator.validate(probe);
         if (violation.hasErrors()) {
             Response response = new Response(false, 604, null);
@@ -458,7 +460,9 @@
             response.setWarnings(violation.getWarnings());
             return response;
         }
-        factory.findUmweltId(probe);
+        if (probe.getUmwId() == null || probe.getUmwId() == "") {
+            factory.findUmweltId(probe);
+        }
         probe.setLetzteAenderung(new Timestamp(new Date().getTime()));
         Response response = defaultRepo.update(probe, "land");
         Response updated = defaultRepo.getById(
This site is hosted by Intevation GmbH (Datenschutzerklärung und Impressum | Privacy Policy and Imprint)