diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-10-09 13:59:40 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-10-31 09:23:12 -0700 |
| commit | 7b6b3f784cdb5028dc0f2d85a02f355249eafbee (patch) | |
| tree | 96367d33ce5340a7269e9cafc0d9273ec989c0f4 | |
| parent | 85a27ede2229c0ba5b70311da45f9d7e7f516394 (diff) | |
| download | dexmaker-kitkat-mr1-release.tar.gz | |
Do not assert that InvocationHandler.invoke args should be non-nullandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-4.4w_r1android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-dev
Bug: https://code.google.com/p/dexmaker/issues/detail?id=27
Bug: 10862083
(cherry picked from commit 744d6f6da5766da5c9ed5d6732604d5e2004771e)
Change-Id: I209149d2db1f1adf3ad315243a862de73a616f12
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | bug-10862083.patch | 16 | ||||
| -rw-r--r-- | src/mockito/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java | 5 |
3 files changed, 18 insertions, 5 deletions
@@ -18,5 +18,7 @@ bug-8108255.patch: temporary workaround to ClassLoading issues (see https://code.google.com/p/dexmaker/issues/detail?id=20) bug-8297640.patch: temporary workaround for a breakage in object instantiation (see https://code.google.com/p/dexmaker/issues/detail?id=22) +bug-10862083.patch: Do not assert that InvocationHandler.invoke args should be non-null + (see https://code.google.com/p/dexmaker/issues/detail?id=27) (to apply, run 'patch -p0 < bug-xyz.patch' from a fresh src) diff --git a/bug-10862083.patch b/bug-10862083.patch new file mode 100644 index 0000000..0dec4c3 --- /dev/null +++ b/bug-10862083.patch @@ -0,0 +1,16 @@ +diff --git a/src/mockito/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java b/src/mockito/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java +index 268f2fd..2775a63 100644 +--- a/src/mockito/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java ++++ b/src/mockito/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java +@@ -45,11 +45,6 @@ final class InvocationHandlerAdapter implements InvocationHandler { + return System.identityHashCode(proxy); + } + +- if (args == null) { +- throw new IllegalArgumentException(); +- } +- +- + ProxiedMethod proxiedMethod = new ProxiedMethod(method); + return handler.handle(new InvocationImpl(proxy, proxiedMethod, args, SequenceNumber.next(), + proxiedMethod)); diff --git a/src/mockito/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java b/src/mockito/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java index 268f2fd..2775a63 100644 --- a/src/mockito/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java +++ b/src/mockito/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java @@ -45,11 +45,6 @@ final class InvocationHandlerAdapter implements InvocationHandler { return System.identityHashCode(proxy); } - if (args == null) { - throw new IllegalArgumentException(); - } - - ProxiedMethod proxiedMethod = new ProxiedMethod(method); return handler.handle(new InvocationImpl(proxy, proxiedMethod, args, SequenceNumber.next(), proxiedMethod)); |