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

(-)src/main/org/apache/tools/ant/Main.java (+2 lines)
Lines 690-695 Link Here
690
        }
690
        }
691
691
692
        final Project project = new Project();
692
        final Project project = new Project();
693
        if (coreLoader == null || coreLoader instanceof AntClassLoader == false)
694
            coreLoader = new AntClassLoader(coreLoader, project, null, true);
693
        project.setCoreLoader(coreLoader);
695
        project.setCoreLoader(coreLoader);
694
696
695
        Throwable error = null;
697
        Throwable error = null;
(-)src/main/org/apache/tools/ant/taskdefs/Classloader.java (-2 / +11 lines)
Lines 169-177 Link Here
169
                return;
169
                return;
170
            }
170
            }
171
171
172
            String loaderName = (name == null) ? SYSTEM_LOADER_REF : name;
172
            String loaderName;
173
            Object obj;
174
            if (name == null || SYSTEM_LOADER_REF.equals(name)) {
175
                name = null;
176
                loaderName = SYSTEM_LOADER_REF;
177
                obj = getProject().getCoreLoader();
178
            }
179
            else {
180
                loaderName = name;
181
                obj = getProject().getReference(loaderName);
182
            }
173
183
174
            Object obj = getProject().getReference(loaderName);
175
            if (reset) {
184
            if (reset) {
176
                // Are any other references held ? Can we 'close' the loader
185
                // Are any other references held ? Can we 'close' the loader
177
                // so it removes the locks on jars ?
186
                // so it removes the locks on jars ?

Return to bug 47003