blob: bdccc8e743b3f991a3ba805eb7bce9aa85bff39a [file] [log] [blame]
diff -ur a/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java b/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java
--- a/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java 2013-01-07 11:27:13.000000000 -0800
+++ b/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java 2013-02-15 11:27:44.000000000 -0800
@@ -45,9 +45,10 @@
Class[] classesToMock = new Class[extraInterfaces.length + 1];
classesToMock[0] = typeToMock;
System.arraycopy(extraInterfaces, 0, classesToMock, 1, extraInterfaces.length);
+ ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
@SuppressWarnings("unchecked") // newProxyInstance returns the type of typeToMock
- T mock = (T) Proxy.newProxyInstance(typeToMock.getClassLoader(),
- classesToMock, invocationHandler);
+ T mock = (T) Proxy.newProxyInstance(contextClassLoader, classesToMock,
+ invocationHandler);
return mock;
} else {