Attachment #52937 for bug #121777

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 121777
Collapse All | Expand All





                                                           if (bangSlash != -1) {
                                                               // underlying URL inside jar:, generally file:
                                                               // XXX why is this not using FileUtil.getArchiveFile?
                                                               try {
                                                                   URI layerJarURL = new URI(s.substring(4,
                                                                                                         bangSlash));

                                                                   if ("file".equals(layerJarURL.getScheme())) {
                                                                       { // #121777
                                                                           String s2 = layerJarURL.toString();
                                                                           if (s2.startsWith("file:") && !s2.startsWith("file:/")) {
                                                                               layerJarURL = new URI("file:/" + s2.substring(5));
                                                                           }
                                                                       }
                                                                       files.add(new File(layerJarURL));
                                                                   } else {
                                                                       err.warning(




                    continue;
                }
                URL jarURL = FileUtil.getArchiveFile(manifestUrl);
                if (jarURL != null && jarURL.getProtocol().equals("file") &&
                        /* #121777 */ jarURL.getPath().startsWith("/")) {
                    LOG.log(Level.FINE, "Considering JAR: {0}", jarURL);
                try {
                        if (ignoredJars.contains(new File(jarURL.toURI()))) {
                        LOG.log(Level.FINE, "ignoring JDK/JRE manifest: {0}", manifestUrl);
                        continue MANIFESTS;
                    }
                } catch (URISyntaxException x) {
                    Exceptions.printStackTrace(x);
                }
                }
                LOG.log(Level.FINE, "Checking boot manifest: {0}", manifestUrl);
                
                InputStream is;

Return to bug 121777

Lines 263-273 Link Here

(-)core/src/org/netbeans/core/LookupCache.java (+7 lines)
263		263
264	if (bangSlash != -1) {	264	if (bangSlash != -1) {
265	// underlying URL inside jar:, generally file:	265	// underlying URL inside jar:, generally file:
		266	// XXX why is this not using FileUtil.getArchiveFile?
266	try {	267	try {
267	URI layerJarURL = new URI(s.substring(4,	268	URI layerJarURL = new URI(s.substring(4,
268	bangSlash));	269	bangSlash));
269		270
270	if ("file".equals(layerJarURL.getScheme())) {	271	if ("file".equals(layerJarURL.getScheme())) {
		272	{ // #121777
		273	String s2 = layerJarURL.toString();
		274	if (s2.startsWith("file:") && !s2.startsWith("file:/")) {
		275	layerJarURL = new URI("file:/" + s2.substring(5));
		276	}
		277	}
271	files.add(new File(layerJarURL));	278	files.add(new File(layerJarURL));
272	} else {	279	} else {
273	err.warning(	280	err.warning(

Lines 196-209 Link Here

(-)core/startup/src/org/netbeans/core/startup/ModuleSystem.java (-1 / +5 lines)
196	continue;	196	continue;
197	}	197	}
198	URL jarURL = FileUtil.getArchiveFile(manifestUrl);	198	URL jarURL = FileUtil.getArchiveFile(manifestUrl);
		199	if (jarURL != null && jarURL.getProtocol().equals("file") &&
		200	/* #121777 */ jarURL.getPath().startsWith("/")) {
		201	LOG.log(Level.FINE, "Considering JAR: {0}", jarURL);
199	try {	202	try {
200	if (jarURL != null && jarURL.getProtocol().equals("file") && ignoredJars.contains(new File(jarURL.toURI()))) {	203	if (ignoredJars.contains(new File(jarURL.toURI()))) {
201	LOG.log(Level.FINE, "ignoring JDK/JRE manifest: {0}", manifestUrl);	204	LOG.log(Level.FINE, "ignoring JDK/JRE manifest: {0}", manifestUrl);
202	continue MANIFESTS;	205	continue MANIFESTS;
203	}	206	}
204	} catch (URISyntaxException x) {	207	} catch (URISyntaxException x) {
205	Exceptions.printStackTrace(x);	208	Exceptions.printStackTrace(x);
206	}	209	}
		210	}
207	LOG.log(Level.FINE, "Checking boot manifest: {0}", manifestUrl);	211	LOG.log(Level.FINE, "Checking boot manifest: {0}", manifestUrl);
208		212
209	InputStream is;	213	InputStream is;