From d5d8d7503f33e5d28fab69dc97759c1bb60edad0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Mon, 17 Sep 2018 21:54:01 +0200
Subject: [PATCH] return error if passing not existing classification uuid to
 taxon search web service

---
 .../cdm/remote/controller/TaxonListController.java       | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java
index aa6c19b81d..5476631f31 100644
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java
@@ -345,17 +345,16 @@ public class TaxonListController extends AbstractIdentifiableListController<Taxo
              highlighting = false;
          }
 
-         Classification classification = null;
-         if(treeUuid != null){
-            classification = classificationService.find(treeUuid);
-         }
+         Classification classification = getClassificationOrError(treeUuid, classificationService, response);
          TaxonNode subtree = getSubtreeOrError(subtreeUuid, taxonNodeService, response);
 
          List<Feature> features = null;
          if(featureUuids != null){
             features = new ArrayList<>(featureUuids.size());
             for(UUID uuid : featureUuids){
-                features.add((Feature) termService.find(uuid));
+                //TODO error if null
+                Feature feature = (Feature) termService.find(uuid);
+                features.add(feature);
             }
          }
 
-- 
2.34.1