This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_4_0_X by this push:
new 194ad3aebf fix for NPE
194ad3aebf is described below
commit 194ad3aebf3d3d240e5572cb87910c78399312dd
Author: Eric Milles <[email protected]>
AuthorDate: Wed May 29 16:10:11 2024 -0500
fix for NPE
---
src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
b/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
index cc7535c426..fad7a9d64c 100644
--- a/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
+++ b/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
@@ -1123,7 +1123,8 @@ public class GeneralUtils {
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) {
