From d733a32f7c2c48b872f9674bf12129b5b14079eb Mon Sep 17 00:00:00 2001
From: Dinnerbone <dinnerbone@dinnerbone.com>
Date: Tue, 8 Mar 2011 18:20:34 +0000
Subject: Reverted classloader changes by 1f0d89be27, now actually works!
 Again!

---
 .../org/bukkit/plugin/java/PluginClassLoader.java    | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
index bc6cb0a2..d17e0f4f 100644
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -24,25 +24,17 @@ public class PluginClassLoader extends URLClassLoader {
         Class<?> result = classes.get(name);
 
         if (result == null) {
-            ClassNotFoundException ex = null;
+            result = loader.getClassByName(name);
 
-            try {
+            if (result == null) {
                 result = super.findClass(name);
-            } catch (ClassNotFoundException e) {
-                ex = e;
-            }
 
-            if (result != null) {
-                loader.setClass(name, result);
-            } else {
-                result = loader.getClassByName(name);
+                if (result != null) {
+                    loader.setClass(name, result);
+                }
             }
 
-            if (result != null ) {
-                classes.put(name, result);
-            } else {
-                throw ex;
-            }
+            classes.put(name, result);
         }
 
         return result;
-- 
cgit v1.2.3