diff options
author | Paul Duffin <paulduffin@google.com> | 2016-07-22 11:41:12 +0100 |
---|---|---|
committer | Paul Duffin <paulduffin@google.com> | 2016-08-02 16:21:47 +0100 |
commit | 2aab5a3225ba5f914a2def3ecd1ef8b0315cfb5b (patch) | |
tree | a9e2f3251c20736b558ac4e8805c741bcb09e037 /src | |
parent | e03a0f42b85425bffd40bcf790819671a7848c1a (diff) | |
download | mockito-2aab5a3225ba5f914a2def3ecd1ef8b0315cfb5b.tar.gz |
Fix some generic/casting issues
These are probably a result of a tightening up of generic
handling in the compiler.
Bug: 30299479
Test: Will test once compiler bugs are fixed.
Change-Id: I2a20dc0f6cd65d8ee26a4aa274e686f129b9b3fd
Diffstat (limited to 'src')
-rw-r--r-- | src/org/mockito/internal/creation/cglib/ClassImposterizer.java | 2 | ||||
-rw-r--r-- | src/org/mockito/internal/creation/instance/ObjenesisInstantiator.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/org/mockito/internal/creation/cglib/ClassImposterizer.java b/src/org/mockito/internal/creation/cglib/ClassImposterizer.java index e30dd3b..3d74b5b 100644 --- a/src/org/mockito/internal/creation/cglib/ClassImposterizer.java +++ b/src/org/mockito/internal/creation/cglib/ClassImposterizer.java @@ -46,7 +46,7 @@ class ClassImposterizer { }; public <T> T imposterise(final MethodInterceptor interceptor, Class<T> mockedType, Collection<Class> ancillaryTypes) { - return imposterise(interceptor, mockedType, ancillaryTypes.toArray(new Class[ancillaryTypes.size()])); + return (T) imposterise(interceptor, mockedType, ancillaryTypes.toArray(new Class[ancillaryTypes.size()])); } public <T> T imposterise(final MethodInterceptor interceptor, Class<T> mockedType, Class<?>... ancillaryTypes) { diff --git a/src/org/mockito/internal/creation/instance/ObjenesisInstantiator.java b/src/org/mockito/internal/creation/instance/ObjenesisInstantiator.java index 1ca0003..15172bd 100644 --- a/src/org/mockito/internal/creation/instance/ObjenesisInstantiator.java +++ b/src/org/mockito/internal/creation/instance/ObjenesisInstantiator.java @@ -11,6 +11,6 @@ class ObjenesisInstantiator implements Instantiator { private final ObjenesisStd objenesis = new ObjenesisStd(new GlobalConfiguration().enableClassCache()); public <T> T newInstance(Class<T> cls) { - return objenesis.newInstance(cls); + return (T) objenesis.newInstance(cls); } } |