svn commit: r355827 - /maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/IsolatedClassLoader.java

[jd...@apache.org]

Author: jdcasey
Date: Sat Dec 10 16:31:09 2005
New Revision: 355827

URL: http://svn.apache.org/viewcvs?rev=355827&view=rev
Log:
Rolling back the commented loadClass(..) method.

Modified:
    maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/IsolatedClassLoader.java

Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/IsolatedClassLoader.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/IsolatedClassLoader.java?rev=355827&r1=355826&r2=355827&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/IsolatedClassLoader.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/IsolatedClassLoader.java Sat Dec 10 16:31:09 2005
@@ -7,7 +7,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      http:www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -50,35 +50,35 @@
         }
     }
 
-//    public synchronized Class loadClass( String className )
-//        throws ClassNotFoundException
-//    {
-//        Class c = findLoadedClass( className );
-//
-//        ClassNotFoundException ex = null;
-//
-//        if ( c == null )
-//        {
-//            try
-//            {
-//                c = findClass( className );
-//            }
-//            catch ( ClassNotFoundException e )
-//            {
-//                ex = e;
-//
-//                if ( parent != null )
-//                {
-//                    c = parent.loadClass( className );
-//                }
-//            }
-//        }
-//
-//        if ( c == null )
-//        {
-//            throw ex;
-//        }
-//
-//        return c;
-//    }
+    public synchronized Class loadClass( String className )
+        throws ClassNotFoundException
+    {
+        Class c = findLoadedClass( className );
+
+        ClassNotFoundException ex = null;
+
+        if ( c == null )
+        {
+            try
+            {
+                c = findClass( className );
+            }
+            catch ( ClassNotFoundException e )
+            {
+                ex = e;
+
+                if ( parent != null )
+                {
+                    c = parent.loadClass( className );
+                }
+            }
+        }
+
+        if ( c == null )
+        {
+            throw ex;
+        }
+
+        return c;
+    }
 }