This is an automated email from the ASF dual-hosted git repository. lkishalmi 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 55bc01867b Fix #5015: Fix Gradle/broken task dependency and serialization (#5022) 55bc01867b is described below commit 55bc01867bb4602185d3fad2672479125b69fb77 Author: Svatopluk Dedic <svatopluk.de...@oracle.com> AuthorDate: Fri Dec 2 19:20:07 2022 +0100 Fix #5015: Fix Gradle/broken task dependency and serialization (#5022) * Avoid failing on broken tasks during dependency inspection * Corrected bad check for primitive class that passed also generated proxies (fixes #5015) --- .../modules/gradle/tooling/NbProjectInfoBuilder.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java index a40b9d94f0..0fd561a2cd 100644 --- a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java +++ b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java @@ -330,11 +330,16 @@ class NbProjectInfoBuilder { } private String dependenciesAsString(Task t, TaskDependency td) { - Set<? extends Task> deps = td.getDependencies(t); - if (deps.isEmpty()) { + try { + Set<? extends Task> deps = td.getDependencies(t); + if (deps.isEmpty()) { + return ""; + } + return deps.stream().map(Task::getPath).collect(Collectors.joining(",")); + } catch (LinkageError | RuntimeException ex) { + LOG.warn("Error getting dependencies for task {}: {}", t.getName(), ex.getLocalizedMessage(), ex); return ""; } - return deps.stream().map(Task::getPath).collect(Collectors.joining(",")); } private void detectConfigurationArtifacts(NbProjectInfoModel model) { @@ -503,13 +508,7 @@ class NbProjectInfoBuilder { return false; } String n = c.getName(); - if (n.indexOf('.') == -1) { - return true; - } else if (n.startsWith("java.lang.")) { - return true; - } - - return false; + return c.isPrimitive() || n.startsWith("java.lang."); } /** --------------------------------------------------------------------- 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