aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java b/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java
index 15db475..7bf2e4d 100644
--- a/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java
+++ b/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java
@@ -78,6 +78,9 @@ public final class DexmakerMockMaker implements MockMaker, StackTraceCleanerProv
}
private InvocationHandlerAdapter getInvocationHandlerAdapter(Object mock) {
+ if (mock == null) {
+ return null;
+ }
if (Proxy.isProxyClass(mock.getClass())) {
InvocationHandler invocationHandler = Proxy.getInvocationHandler(mock);
return invocationHandler instanceof InvocationHandlerAdapter