| Paul Duffin | a4d0f61 | 2016-07-22 11:49:48 +0100 | [diff] [blame] | 1 | diff -ur a/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java b/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java |
| 2 | --- a/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java 2013-01-07 11:27:13.000000000 -0800 |
| 3 | +++ b/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java 2013-02-15 11:27:44.000000000 -0800 |
| ls | 8a5ce53 | 2013-02-15 11:38:36 -0800 | [diff] [blame] | 4 | @@ -45,9 +45,10 @@ |
| 5 | Class[] classesToMock = new Class[extraInterfaces.length + 1]; |
| 6 | classesToMock[0] = typeToMock; |
| 7 | System.arraycopy(extraInterfaces, 0, classesToMock, 1, extraInterfaces.length); |
| 8 | + ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); |
| 9 | @SuppressWarnings("unchecked") // newProxyInstance returns the type of typeToMock |
| 10 | - T mock = (T) Proxy.newProxyInstance(typeToMock.getClassLoader(), |
| 11 | - classesToMock, invocationHandler); |
| 12 | + T mock = (T) Proxy.newProxyInstance(contextClassLoader, classesToMock, |
| 13 | + invocationHandler); |
| 14 | return mock; |
| 15 | |
| 16 | } else { |