diff options
| -rw-r--r-- | README.android | 2 | ||||
| -rw-r--r-- | src/org/mockito/internal/creation/cglib/ClassImposterizer.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/README.android b/README.android index c9df152..db40633 100644 --- a/README.android +++ b/README.android @@ -10,3 +10,5 @@ The source can be updated using the update_source.sh script. Local Modifications: Fixed some generic/casting issues probably caused by stricter compiler. + Fixed compiler failure caused by upstream mismatch between the cglib-and-asm + source and prebuilt library. 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; } }; |