Fixed occurrence of NoClassDefFoundError when Introspector.getBeanInf…

…o(cls) got called on a $Impl class; closes #234.
jmockit · Nov 2, 2015 · 82cd64f · 82cd64f
1 parent 726a960
commit 82cd64f
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 17 deletions.
diff --git a/main/src/mockit/internal/classGeneration/ImplementationClass.java b/main/src/mockit/internal/classGeneration/ImplementationClass.java
@@ -51,25 +51,31 @@ public final Class<T> generateClass()
    @Nonnull
    private Class<T> defineNewClass(@Nonnull ClassVisitor modifier)
    {
-      ClassLoader parentLoader = sourceClass.getClassLoader();
-
-      if (parentLoader == null) {
-         parentLoader = ImplementationClass.class.getClassLoader();
-      }
-
+      ClassLoader sourceClassLoader = sourceClass.getClassLoader();
+      final ClassLoader parentLoader =
+         sourceClassLoader != null ? sourceClassLoader : ImplementationClass.class.getClassLoader();
       final byte[] modifiedClassfile = modifier.toByteArray();
 
-      @SuppressWarnings("unchecked")
-      Class<T> generatedClass = (Class<T>) new ClassLoader(parentLoader) {
-         @Override
-         protected Class<?> findClass(String name)
-         {
-            return defineClass(name, modifiedClassfile, 0, modifiedClassfile.length);
-         }
-      }.findClass(generatedClassName);
-
-      generatedBytecode = modifiedClassfile;
-      return generatedClass;
+      try {
+         @SuppressWarnings("unchecked")
+         Class<T> generatedClass = (Class<T>) new ClassLoader(parentLoader) {
+            @Override
+            protected Class<?> findClass(String name) throws ClassNotFoundException
+            {
+               if (!name.equals(generatedClassName)) {
+                  return parentLoader.loadClass(name);
+               }
+
+               return defineClass(name, modifiedClassfile, 0, modifiedClassfile.length);
+            }
+         }.findClass(generatedClassName);
+
+         generatedBytecode = modifiedClassfile;
+         return generatedClass;
+      }
+      catch (ClassNotFoundException e) {
+         throw new RuntimeException("Unable to define class: " + generatedClassName, e);
+      }
    }
 
    @Nullable

diff --git a/main/test/mockit/ExpectationsUsingReflectionTest.java b/main/test/mockit/ExpectationsUsingReflectionTest.java
@@ -4,6 +4,7 @@
  */
 package mockit;
 
+import java.beans.*;
 import java.util.*;
 
 import org.junit.*;
@@ -462,4 +463,14 @@ public void createNewInnerInstance()
          }
       };
    }
+
+   @Test
+   public void getBeanInfoFromMockedInterface(@Mocked BusinessInterface mock) throws Exception
+   {
+      Class<? extends BusinessInterface> mockClass = mock.getClass();
+
+      BeanInfo info = Introspector.getBeanInfo(mockClass);
+
+      assertNotNull(info);
+   }
 }