This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 99f342e4ab Adding system path into the classpath info when parsing
custom conditions in a hint file. Avoid failures while constructing custom
scopes.
new 5197f07668 Merge pull request #5296 from
jlahoda/correct-declarative-hints-boot
99f342e4ab is described below
commit 99f342e4abfeaa3c6ba4c512f36b473705d48358
Author: Jan Lahoda <[email protected]>
AuthorDate: Sun Jan 15 18:08:40 2023 +0100
Adding system path into the classpath info when parsing custom conditions
in a hint file. Avoid failures while constructing custom scopes.
---
.../modules/java/hints/declarative/DeclarativeHintsParser.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git
a/java/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/DeclarativeHintsParser.java
b/java/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/DeclarativeHintsParser.java
index 21cea1f9f3..d2826b20f9 100644
---
a/java/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/DeclarativeHintsParser.java
+++
b/java/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/DeclarativeHintsParser.java
@@ -464,8 +464,14 @@ public class DeclarativeHintsParser {
}
}
if (result == null) {
- result =
ClasspathInfo.create(ClassPathSupport.createProxyClassPath(
- javacPath,
cpInfo.getClassPath(ClasspathInfo.PathKind.BOOT)), ClassPath.EMPTY,
ClassPath.EMPTY);
+ ClassPath bootCP =
+ ClassPathSupport.createProxyClassPath(javacPath,
+
cpInfo.getClassPath(ClasspathInfo.PathKind.BOOT)
+ );
+ ClassPath systemCP =
cpInfo.getClassPath(ClasspathInfo.PathKind.MODULE_BOOT);
+ result = new ClasspathInfo.Builder(bootCP)
+ .setModuleBootPath(systemCP)
+ .build();
cache = new WeakReference<>(new Holder(result, cpInfo));
}
cpInfo = result;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
