From 6539d3b0d0143ff018c77db70e87b6f42beee51e Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 18 Jun 2013 18:56:16 +0400
Subject: [PATCH] IDEA-109172 (classpath URL decoding restored)

---
 .../intellij/ide/plugins/PluginManagerCore.java   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
index feb8ad8a8662..9ffddbce8451 100644
--- a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
@@ -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;