MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-109172 (classpath URL decoding restored)

Browse Source
This commit is contained in:
Roman Shevchenko
2013-06-18 18:56:16 +04:00
parent 8a2413e4b3
commit 6539d3b0d0
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+9 -6
View File
@@ -49,10 +49,7 @@ import org.jetbrains.annotations.Nullable;
import java.io.*;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.net.URLClassLoader;
import java.net.*;
import java.util.*;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
@@ -634,7 +631,7 @@ public class PluginManagerCore {
if (optionalDescriptor == null && !FileUtil.isJarOrZip(file)) {
for (URL url : getClassLoaderUrls()) {
if ("file".equals(url.getProtocol())) {
optionalDescriptor = loadDescriptor(new File(url.getFile()), optionalDescriptorName);
optionalDescriptor = loadDescriptor(new File(decodeUrl(url.getFile())), optionalDescriptorName);
if (optionalDescriptor != null) {
break;
}
@@ -788,7 +785,7 @@ public class PluginManagerCore {
for (URL url : urls) {
i++;
if ("file".equals(url.getProtocol())) {
File file = new File(url.getFile());
File file = new File(decodeUrl(url.getFile()));
IdeaPluginDescriptorImpl platformPluginDescriptor = null;
if (platformPrefix != null) {
@@ -817,6 +814,12 @@ public class PluginManagerCore {
}
}
@SuppressWarnings("deprecation")
private static String decodeUrl(String file) {
String quotePluses = StringUtil.replace(file, "+", "%2B");
return URLDecoder.decode(quotePluses);
}
static void loadDescriptorsFromProperty(final List<IdeaPluginDescriptorImpl> result) {
final String pathProperty = System.getProperty(PROPERTY_PLUGIN_PATH);
if (pathProperty == null) return;