Fix for issue #519: add null safety to binding.superInterfaces

groovy · Mar 7, 2018 · 7f047e7 · 7f047e7
1 parent 9f96fad
commit 7f047e7
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/...e.jdt.groovy.core/src/org/codehaus/jdt/groovy/internal/compiler/ast/GroovyClassScope.java b/...e.jdt.groovy.core/src/org/codehaus/jdt/groovy/internal/compiler/ast/GroovyClassScope.java
@@ -92,14 +92,12 @@ protected MethodBinding[] augmentMethodBindings(MethodBinding[] methodBindings)
         }
         boolean implementsGroovyLangObject = false;
 
-        ReferenceBinding[] superInterfaces = binding.superInterfaces;
-        if (superInterfaces != null) {
-            for (int i = 0, max = superInterfaces.length; i < max; i++) {
-                char[][] interfaceName = superInterfaces[i].compoundName;
-                if (CharOperation.equals(interfaceName, GROOVY_LANG_GROOVYOBJECT)) {
-                    implementsGroovyLangObject = true;
-                    break;
-                }
+        ReferenceBinding[] superInterfaces = binding.superInterfaces != null ? binding.superInterfaces : new ReferenceBinding[0];
+        for (int i = 0, max = superInterfaces.length; i < max; i++) {
+            char[][] interfaceName = superInterfaces[i].compoundName;
+            if (CharOperation.equals(interfaceName, GROOVY_LANG_GROOVYOBJECT)) {
+                implementsGroovyLangObject = true;
+                break;
             }
         }