fix for NPE

eric-milles · eric-milles · commit 3624b9b653d8 · 2024-05-29T16:10:11.000-05:00
diff --git a/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java b/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
@@ -996,7 +996,8 @@ public static boolean inSamePackage(final ClassNode first, final ClassNode secon
 
     public static boolean inSamePackage(final Class<?>  first, final Class<?>  second) {
         Package firstPackage = first.getPackage(), secondPackage = second.getPackage();
-        return (firstPackage == null ? secondPackage == null : firstPackage.getName().equals(secondPackage.getName()));
+        return (firstPackage == secondPackage || (firstPackage != null && secondPackage != null
+                                                  && firstPackage.getName().equals(secondPackage.getName())));
     }
 
     public static boolean isDefaultVisibility(final int modifiers) {

Original file line number	Diff line number	Diff line change
`@@ -996,7 +996,8 @@ public static boolean inSamePackage(final ClassNode first, final ClassNode secon`
`996`	`996`
`997`	`997`	`public static boolean inSamePackage(final Class<?> first, final Class<?> second) {`
`998`	`998`	`Package firstPackage = first.getPackage(), secondPackage = second.getPackage();`
`999`		`- return (firstPackage == null ? secondPackage == null : firstPackage.getName().equals(secondPackage.getName()));`
	`999`	`+ return (firstPackage == secondPackage \|\| (firstPackage != null && secondPackage != null`
	`1000`	`+ && firstPackage.getName().equals(secondPackage.getName())));`
`1000`	`1001`	`}`
`1001`	`1002`
`1002`	`1003`	`public static boolean isDefaultVisibility(final int modifiers) {`