From f7c18ecca161fd9acbbc7808d44dd4e7f0ec8aae Mon Sep 17 00:00:00 2001 From: nik Date: Mon, 15 Feb 2016 17:05:01 +0300 Subject: [PATCH] UrlClassLoader: removed dependency on Patches to avoid its premature initialization if UrlClassLoader is used as java.system.class.loader (IDEA-CR-8434) --- platform/util/src/com/intellij/util/lang/UrlClassLoader.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/platform/util/src/com/intellij/util/lang/UrlClassLoader.java b/platform/util/src/com/intellij/util/lang/UrlClassLoader.java index 32320a9d56b2..c9846dd509ba 100644 --- a/platform/util/src/com/intellij/util/lang/UrlClassLoader.java +++ b/platform/util/src/com/intellij/util/lang/UrlClassLoader.java @@ -15,7 +15,6 @@ */ package com.intellij.util.lang; -import com.intellij.Patches; import com.intellij.openapi.application.PathManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.SystemInfo; @@ -55,7 +54,6 @@ public class UrlClassLoader extends ClassLoader { // Unless explicitly disabled, request parallel loading capability via reflection due to current platform's Java 6 baseline // todo[r.sh] drop condition in IDEA 15 // todo[r.sh] drop reflection after migrating to Java 7+ - assert Patches.USE_REFLECTION_TO_ACCESS_JDK7; // IBM's classloader breaks when overridden getClassLoadingLock() is called, see https://youtrack.jetbrains.com/issue/IDEA-149187 // so disallow parallel loading completely on JBM jdk