[Lada-commits] [PATCH 1 of 2] Avoid NPE if requested object does not exist

[Wald Commits]

# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1464192614 -7200
# Node ID 539eb174bf23d9deda07ce24c5a4a00963443011
# Parent  58fc5b5fad4bd314eb2e36fced0e8b5673780ea7
Avoid NPE if requested object does not exist.

diff -r 58fc5b5fad4b -r 539eb174bf23 src/main/java/de/intevation/lada/rest/OrtService.java
--- a/src/main/java/de/intevation/lada/rest/OrtService.java	Wed May 25 16:51:55 2016 +0200
+++ b/src/main/java/de/intevation/lada/rest/OrtService.java	Wed May 25 18:10:14 2016 +0200
@@ -321,7 +321,6 @@
         @Context HttpServletRequest request,
         @PathParam("id") String id
     ) {
-        /* Get the messwert object by id*/
         Response object =
             defaultRepo.getById(LOrtszuordnung.class, Integer.valueOf(id), "land");
         LOrtszuordnung ortObj = (LOrtszuordnung)object.getData();
@@ -335,7 +334,7 @@
         if (lock.isLocked(ortObj)) {
             return new Response(false, 697, null);
         }
-        /* Delete the messwert object*/
+
         return defaultRepo.delete(ortObj, "land");
     }
 }
diff -r 58fc5b5fad4b -r 539eb174bf23 src/main/java/de/intevation/lada/rest/stamm/OrtService.java
--- a/src/main/java/de/intevation/lada/rest/stamm/OrtService.java	Wed May 25 16:51:55 2016 +0200
+++ b/src/main/java/de/intevation/lada/rest/stamm/OrtService.java	Wed May 25 18:10:14 2016 +0200
@@ -345,9 +345,12 @@
         @Context HttpServletRequest request,
         @PathParam("id") String id
     ) {
-        /* Get the object by id*/
-        Ort ort =
-            repository.getByIdPlain(Ort.class, Integer.valueOf(id), "stamm");
+        Response response =
+            repository.getById(Ort.class, Integer.valueOf(id), "stamm");
+        if (!response.getSuccess()) {
+            return response;
+        }
+        Ort ort = (Ort)response.getData();
         if (!authorization.isAuthorized(
             request,
             ort,
@@ -356,7 +359,7 @@
         ) {
             return new Response(false, 699, ort);
         }
-        /* Delete the object*/
+
         return repository.delete(ort, "stamm");
     }
 }