Fix for issue #616: add null check for top-level package

groovy · Jul 12, 2018 · 43d2d59 · 43d2d59
1 parent bbbecef
commit 43d2d59
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 16 deletions.
diff --git a/...eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LookupEnvironment.java b/...eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LookupEnvironment.java
@@ -1543,14 +1543,19 @@ PackageBinding getPackage0(char[] name) {
 }
 // GROOVY add -- for GroovyCompilationUnitScope.getDefaultImports()
 public PackageBinding getPackage(char[][] packageName, ModuleBinding moduleBinding) {
-	assert packageName != null && packageName.length == 2 : "Invalid packageName"; //$NON-NLS-1$
-	Binding binding = getTopLevelPackage(packageName[0]).getTypeOrPackage(packageName[1], moduleBinding);
-	if (binding == null || !binding.isValidBinding() || !(binding instanceof PackageBinding)) {
-		org.eclipse.jdt.internal.core.util.Util.log(org.eclipse.core.runtime.IStatus.WARNING,
-			"Invalid package binding for default import: " + CharOperation.toString(packageName)); //$NON-NLS-1$
-		return TheNotFoundPackage;
-	}
-	return (PackageBinding) binding;
+	if (packageName != null && packageName.length == 2) {
+		PackageBinding parent = getTopLevelPackage(packageName[0]);
+		if (parent != null) { // null if java/groovy runtime is not on classpath
+			Binding binding = parent.getTypeOrPackage(packageName[1], moduleBinding);
+			if ((binding instanceof PackageBinding) && binding.isValidBinding()) {
+				return (PackageBinding) binding;
+			}
+		}
+	}
+
+	org.eclipse.jdt.internal.core.util.Util.log(org.eclipse.core.runtime.IStatus.WARNING,
+		"Invalid package binding for default import: " + CharOperation.toString(packageName));
+	return TheNotFoundPackage;
 }
 // GROOVY end
 

diff --git a/...eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LookupEnvironment.java b/...eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LookupEnvironment.java
@@ -1579,14 +1579,19 @@ PackageBinding getPackage0(char[] name) {
 }
 // GROOVY add -- for GroovyCompilationUnitScope.getDefaultImports()
 public PackageBinding getPackage(char[][] packageName, ModuleBinding moduleBinding) {
-	assert packageName != null && packageName.length == 2 : "Invalid packageName"; //$NON-NLS-1$
-	Binding binding = getTopLevelPackage(packageName[0]).getTypeOrPackage(packageName[1], moduleBinding);
-	if (binding == null || !binding.isValidBinding() || !(binding instanceof PackageBinding)) {
-		org.eclipse.jdt.internal.core.util.Util.log(org.eclipse.core.runtime.IStatus.WARNING,
-			"Invalid binding for default import: " + CharOperation.toString(packageName)); //$NON-NLS-1$
-		return TheNotFoundPackage;
-	}
-	return (PackageBinding) binding;
+    if (packageName != null && packageName.length == 2) {
+        PackageBinding parent = getTopLevelPackage(packageName[0]);
+        if (parent != null) { // null if java/groovy runtime is not on classpath
+            Binding binding = parent.getTypeOrPackage(packageName[1], moduleBinding);
+            if ((binding instanceof PackageBinding) && binding.isValidBinding()) {
+                return (PackageBinding) binding;
+            }
+        }
+    }
+
+    org.eclipse.jdt.internal.core.util.Util.log(org.eclipse.core.runtime.IStatus.WARNING,
+        "Invalid package binding for default import: " + CharOperation.toString(packageName));
+    return TheNotFoundPackage;
 }
 // GROOVY end