Bug 561857: fix NPE if extKey is null

266971 Change-Id: I74784c2fa07f1ce926740bb93253751f37e98426 Signed-off-by: Daniel Schmid <Daniel.Schmid@bsiag.com> Reviewed-on: https://git.eclipse.org/r/c/scout/org.eclipse.scout.rt/+/174414 Tested-by: Scout Bot <scout-bot@eclipse.org> Tested-by: Ivan Motsch <ivan.motsch@bsiag.com> Reviewed-by: Ivan Motsch <ivan.motsch@bsiag.com>
eclipse-scout · Jan 8, 2021 · afec739 · afec739
1 parent 1af955a
commit afec739
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/...t.shared/src/main/java/org/eclipse/scout/rt/shared/services/common/code/AbstractCode.java b/...t.shared/src/main/java/org/eclipse/scout/rt/shared/services/common/code/AbstractCode.java
@@ -424,22 +424,19 @@ public ICode<T> getChildCode(T id) {
 
   @Override
   public ICode<T> getChildCodeByExtKey(Object extKey) {
-    if (m_codeList == null) {
+    if (m_codeList == null || extKey == null) {
       return null;
     }
-    ICode<T> c = null;
     for (ICode<T> childCode : m_codeList) {
       if (extKey.equals(childCode.getExtKey())) {
         return childCode;
       }
-      else {
-        c = childCode.getChildCodeByExtKey(extKey);
-        if (c != null) {
-          return c;
-        }
+      ICode<T> c = childCode.getChildCodeByExtKey(extKey);
+      if (c != null) {
+        return c;
       }
     }
-    return c;
+    return null;
   }
 
   @Override

diff --git a/...in/java/org/eclipse/scout/rt/shared/services/common/code/AbstractCodeTypeWithGeneric.java b/...in/java/org/eclipse/scout/rt/shared/services/common/code/AbstractCodeTypeWithGeneric.java
@@ -385,19 +385,16 @@ public CODE getCodeByExtKey(Object extKey) {
     if (extKey == null) {
       return null;
     }
-    CODE c = null;
     for (CODE childCode : m_rootCodeList) {
       if (extKey.equals(childCode.getExtKey())) {
-        c = childCode;
-      }
-      else {
-        c = (CODE) childCode.getChildCodeByExtKey(extKey);
+        return childCode;
       }
+      CODE c = (CODE) childCode.getChildCodeByExtKey(extKey);
       if (c != null) {
         return c;
       }
     }
-    return c;
+    return null;
   }
 
   @Override