From 33efbc3e9138b818a5044a6d5faa033376efdd43 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Tue, 23 Jul 2013 17:34:33 +0400 Subject: [PATCH] Migrate to IDEA 130.1225 Fix the class loader to generate proper resource URLs: we used to have "!" as a JAR separator, but the correct one is "!/", according to the docs here: http://docs.oracle.com/javase/6/docs/api/java/net/JarURLConnection.html --- .../org/jetbrains/jet/preloading/ClassPreloadingUtils.java | 2 +- update_dependencies.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/preloader/src/org/jetbrains/jet/preloading/ClassPreloadingUtils.java b/compiler/preloader/src/org/jetbrains/jet/preloading/ClassPreloadingUtils.java index a9cf32480a8..3f129f6d813 100644 --- a/compiler/preloader/src/org/jetbrains/jet/preloading/ClassPreloadingUtils.java +++ b/compiler/preloader/src/org/jetbrains/jet/preloading/ClassPreloadingUtils.java @@ -191,7 +191,7 @@ public class ClassPreloadingUtils { public URL getURL() { try { - String path = "file:" + jarFile + "!" + resourceName; + String path = "file:" + jarFile + "!/" + resourceName; return new URL("jar", null, 0, path, new URLStreamHandler() { @Override protected URLConnection openConnection(URL u) throws IOException { diff --git a/update_dependencies.xml b/update_dependencies.xml index 7ba18984b64..5fdf093cf5c 100644 --- a/update_dependencies.xml +++ b/update_dependencies.xml @@ -1,6 +1,6 @@ - - + +