diff options
author | Paul Duffin <paulduffin@google.com> | 2016-07-22 13:38:34 +0100 |
---|---|---|
committer | Paul Duffin <paulduffin@google.com> | 2016-08-02 16:22:01 +0100 |
commit | 1816bfd73cd665f0f5bf17a6c46b163b18a7363a (patch) | |
tree | eee83f4206188b0016cd401725bd16e891fe66fd /src | |
parent | 2aab5a3225ba5f914a2def3ecd1ef8b0315cfb5b (diff) | |
download | mockito-1816bfd73cd665f0f5bf17a6c46b163b18a7363a.tar.gz |
Fix upstream mismatch between cglib-and-asm source and library
Upstream has the source for cglib-and-asm but doesn't actually
build against that, instead it builds against a precompiled jar,
lib/repackaged/cglib-and-asm-1.0.jar. As a result of that it
appears as though they have diverged causing this problem.
This is a long standing problem that has been fixed before in
the Android version of mockito.
Bug: 30299479
Test: Run mockito tests in both CTS and Vogar
Change-Id: I12ee1a8c282962ceaa2dff4d45cd7d5fb733845d
Diffstat (limited to 'src')
-rw-r--r-- | src/org/mockito/internal/creation/cglib/ClassImposterizer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org/mockito/internal/creation/cglib/ClassImposterizer.java b/src/org/mockito/internal/creation/cglib/ClassImposterizer.java index 3d74b5b..fb2ad95 100644 --- a/src/org/mockito/internal/creation/cglib/ClassImposterizer.java +++ b/src/org/mockito/internal/creation/cglib/ClassImposterizer.java @@ -40,7 +40,7 @@ class ClassImposterizer { }; private static final CallbackFilter IGNORE_BRIDGE_METHODS = new CallbackFilter() { - public int accept(Method method) { + public int accept(Method method, List<Method> allMethods) { return method.isBridge() ? 1 : 0; } }; |