[hornetq-commits] JBoss hornetq SVN: r11718 - branches/Branch_2_2_AS7/src/main/org/hornetq/ra/recovery.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2011-11-18 17:11:50 -0500 (Fri, 18 Nov 2011)
New Revision: 11718

Modified:
   branches/Branch_2_2_AS7/src/main/org/hornetq/ra/recovery/RecoveryManager.java
Log:
Using the ClassLoading util

Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/ra/recovery/RecoveryManager.java
===================================================================
--- branches/Branch_2_2_AS7/src/main/org/hornetq/ra/recovery/RecoveryManager.java	2011-11-18 20:39:36 UTC (rev 11717)
+++ branches/Branch_2_2_AS7/src/main/org/hornetq/ra/recovery/RecoveryManager.java	2011-11-18 22:11:50 UTC (rev 11718)
@@ -29,6 +29,7 @@
 import org.hornetq.jms.server.recovery.RecoveryRegistry;
 import org.hornetq.jms.server.recovery.XARecoveryConfig;
 import org.hornetq.ra.Util;
+import org.hornetq.utils.ClassloadingUtil;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -173,30 +174,7 @@
       {
          public Object run()
          {
-            ClassLoader loader = getClass().getClassLoader();
-            try
-            {
-               Class<?> clazz = loader.loadClass(className);
-               return clazz.newInstance();
-            }
-            catch (Throwable t)
-            {
-                try
-                {
-                    loader = Thread.currentThread().getContextClassLoader();
-                    if (loader != null)
-                        return loader.loadClass(className).newInstance();
-                }
-                catch (RuntimeException e)
-                {
-                    throw e;
-                }
-                catch (Exception e)
-                {
-                }
-
-                throw new IllegalArgumentException("Could not find class " + className);
-            }
+            return ClassloadingUtil.newInstanceFromClassLoader(className);
          }
       });
    }