fix NPE for first search
authorKatja Luther <k.luther@bgbm.org>
Tue, 5 Dec 2017 12:40:35 +0000 (13:40 +0100)
committerKatja Luther <k.luther@bgbm.org>
Tue, 5 Dec 2017 12:40:35 +0000 (13:40 +0100)
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java

index f55685d87ed8297ff40960509b0e61dac742daac..8dab79e1e89d53d1986ef27544b720ec0affda92 100644 (file)
@@ -494,12 +494,13 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends ICdmB
         String pattern = null;
         if (control != null){
             pattern = ((Text)control).getText();
+            if (pattern.equals("*")){
+                callService(null);
+            }else if (pattern != null){
+                callService(pattern);
+            }
         }
-        if (pattern.equals("*")){
-            callService(null);
-        }else if (pattern != null){
-            callService(pattern);
-        }
+
 //        if (pattern.equals("?")){
 //            model = CdmStore.getService(INameService.class).getUuidAndTitleCache(null, null);
 //        }else if (pattern != null){