From 9a2cc3ef1de46bce0d228904657a68f388a9df7c Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Mon, 8 Aug 2011 13:02:48 +0200
Subject: [PATCH] blame ICCE to correct plugin (EA-29004 - ICCE:
 UrlClassLoader._defineClass)

---
 .../com/intellij/ide/plugins/cl/PluginClassLoader.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/cl/PluginClassLoader.java b/platform/platform-impl/src/com/intellij/ide/plugins/cl/PluginClassLoader.java
index 124a50f5c90b..e1ddbc895f04 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/cl/PluginClassLoader.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/cl/PluginClassLoader.java
@@ -16,6 +16,7 @@
 
 package com.intellij.ide.plugins.cl;
 
+import com.intellij.diagnostic.PluginException;
 import com.intellij.ide.plugins.PluginManager;
 import com.intellij.openapi.extensions.PluginId;
 import com.intellij.util.lang.UrlClassLoader;
@@ -90,7 +91,12 @@ public class PluginClassLoader extends UrlClassLoader {
       return c;
     }
 
-    c = _findClass(name);
+    try {
+      c = _findClass(name);
+    }
+    catch (IncompatibleClassChangeError e) {
+      throw new PluginException(e, myPluginId);
+    }
     if (c != null) {
       PluginManager.addPluginClass(c.getName(), myPluginId);
     }