This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 223682
Collapse All | Expand All

(-)a/maven/src/org/netbeans/modules/maven/classpath/BootClassPathImpl.java (-4 / +6 lines)
Lines 94-104 Link Here
94
        synchronized (LOCK) {
94
        synchronized (LOCK) {
95
            if (this.resourcesCache == null) {
95
            if (this.resourcesCache == null) {
96
                ArrayList<PathResourceImplementation> result = new ArrayList<PathResourceImplementation> ();
96
                ArrayList<PathResourceImplementation> result = new ArrayList<PathResourceImplementation> ();
97
                result.addAll(ecpImpl.getResources());
97
                boolean[] includeJDK = { true };
98
                result.addAll(ecpImpl.getResources(includeJDK));
98
                lastHintValue = project.getAuxProps().get(Constants.HINT_JDK_PLATFORM, true);
99
                lastHintValue = project.getAuxProps().get(Constants.HINT_JDK_PLATFORM, true);
99
               
100
                if (includeJDK[0]) {
100
                for (ClassPath.Entry entry : findActivePlatform().getBootstrapLibraries().entries()) {
101
                    for (ClassPath.Entry entry : findActivePlatform().getBootstrapLibraries().entries()) {
101
                    result.add(ClassPathSupport.createResource(entry.getURL()));
102
                        result.add(ClassPathSupport.createResource(entry.getURL()));
103
                    }
102
                }
104
                }
103
                resourcesCache = Collections.unmodifiableList (result);
105
                resourcesCache = Collections.unmodifiableList (result);
104
            }
106
            }
(-)a/maven/src/org/netbeans/modules/maven/classpath/EndorsedClassPathImpl.java (+6 lines)
Lines 108-119 Link Here
108
    }
108
    }
109
109
110
    public @Override List<? extends PathResourceImplementation> getResources() {
110
    public @Override List<? extends PathResourceImplementation> getResources() {
111
        boolean[] arr = { false };
112
        return getResources(arr);
113
    }
114
    
115
    final List<? extends PathResourceImplementation> getResources(boolean[] includeJDK) {
111
        assert bcp != null;
116
        assert bcp != null;
112
        synchronized (bcp.LOCK) {
117
        synchronized (bcp.LOCK) {
113
            if (this.resourcesCache == null) {
118
            if (this.resourcesCache == null) {
114
                ArrayList<PathResourceImplementation> result = new ArrayList<PathResourceImplementation> ();
119
                ArrayList<PathResourceImplementation> result = new ArrayList<PathResourceImplementation> ();
115
                String[] boot = getBootClasspath();
120
                String[] boot = getBootClasspath();
116
                if (boot != null) {
121
                if (boot != null) {
122
                    includeJDK[0] = false;
117
                    for (URL u :  stripDefaultJavaPlatform(boot)) {
123
                    for (URL u :  stripDefaultJavaPlatform(boot)) {
118
                        result.add (ClassPathSupport.createResource(u));
124
                        result.add (ClassPathSupport.createResource(u));
119
                    }
125
                    }

Return to bug 223682