This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new 7c607ba [NETBEANS-3867] Fix NPE-s for some rare cases on Gradle projects new 038646e Merge pull request #1945 from lkishalmi/NETBEANS-3867 7c607ba is described below commit 7c607ba3913340d371302372a7111d064a113ddc Author: Laszlo Kishalmi <laszlo.kisha...@gmail.com> AuthorDate: Wed Feb 12 07:44:06 2020 -0800 [NETBEANS-3867] Fix NPE-s for some rare cases on Gradle projects --- .../netbeans/modules/gradle/java/classpath/ClassPathProviderImpl.java | 2 +- .../netbeans/modules/gradle/java/queries/GradleBinaryForSource.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/ClassPathProviderImpl.java b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/ClassPathProviderImpl.java index ad2fdb2..b285b49 100644 --- a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/ClassPathProviderImpl.java +++ b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/ClassPathProviderImpl.java @@ -315,7 +315,7 @@ public final class ClassPathProviderImpl extends ProjectOpenedHook implements Cl public boolean hasModuleInfo() { GradleJavaProject gjp = GradleJavaProject.get(ClassPathProviderImpl.this.project); - GradleJavaSourceSet ss = gjp.getSourceSets().get(group); + GradleJavaSourceSet ss = gjp != null ? gjp.getSourceSets().get(group) : null; return ss != null && ss.findResource(MODULE_INFO_JAVA, false, GradleJavaSourceSet.SourceType.JAVA) != null; } diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleBinaryForSource.java b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleBinaryForSource.java index be92c7b..f4c6898 100644 --- a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleBinaryForSource.java +++ b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleBinaryForSource.java @@ -93,7 +93,8 @@ public class GradleBinaryForSource implements BinaryForSourceQueryImplementation @Override public URL[] getRoots() { - GradleJavaSourceSet ss = GradleJavaProject.get(prj).getSourceSets().get(sourceSetName); + GradleJavaProject gjp = GradleJavaProject.get(prj); + GradleJavaSourceSet ss = gjp != null ? gjp.getSourceSets().get(sourceSetName) : null; if (ss == null) { return new URL[0]; } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists