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 efd05e33dc Filter source roots to avoids clashes between moule-info
files.
efd05e33dc is described below
commit efd05e33dc04ce834d09876d411f0ea7ec9cece6
Author: Jan Lahoda <jlah...@netbeans.org>
AuthorDate: Mon Apr 4 06:22:16 2022 +0200
Filter source roots to avoids clashes between moule-info files.
---
.../modules/java/platform/classpath/PlatformClassPathProvider.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/java/java.platform/src/org/netbeans/modules/java/platform/classpath/PlatformClassPathProvider.java
b/java/java.platform/src/org/netbeans/modules/java/platform/classpath/PlatformClassPathProvider.java
index 699211eae6..ccfdbb5749 100644
---
a/java/java.platform/src/org/netbeans/modules/java/platform/classpath/PlatformClassPathProvider.java
+++
b/java/java.platform/src/org/netbeans/modules/java/platform/classpath/PlatformClassPathProvider.java
@@ -78,9 +78,13 @@ public class PlatformClassPathProvider implements
ClassPathProvider {
ClassPath libraryPath = jp.getStandardLibraries();
ClassPath sourcePath = jp.getSourceFolders();
FileObject root = null;
+ boolean jdk9 =
JAVA_9.compareTo(jp.getSpecification().getVersion()) <= 0;
if (ClassPath.SOURCE.equals(type) && sourcePath != null &&
(root = sourcePath.findOwnerRoot(fo))!=null) {
this.setLastUsedPlatform (root,jp);
+ if (jdk9) {
+ return ClassPathSupport.createClassPath(root);
+ }
return sourcePath;
} else if (ClassPath.BOOT.equals(type) &&
(root = getArtefactOwner(fo, bootClassPath, libraryPath,
sourcePath)) != null ) {
@@ -96,7 +100,7 @@ public class PlatformClassPathProvider implements
ClassPathProvider {
return this.getEmptyClassPath ();
}
} else if (JavaClassPathConstants.MODULE_BOOT_PATH.equals(type) &&
- JAVA_9.compareTo(jp.getSpecification().getVersion()) <= 0
&&
+ jdk9 &&
(root = getArtefactOwner(fo, bootClassPath, libraryPath,
sourcePath)) != null) {
this.setLastUsedPlatform (root,jp);
return bootClassPath;
---------------------------------------------------------------------
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
