diff options
| -rw-r--r-- | vm/reflect/Proxy.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/vm/reflect/Proxy.cpp b/vm/reflect/Proxy.cpp index 02d43eb1d..57d32e793 100644 --- a/vm/reflect/Proxy.cpp +++ b/vm/reflect/Proxy.cpp @@ -66,7 +66,7 @@ static bool mustWrapException(const Method* method, const Object* throwable); ClassObject* dvmGenerateProxyClass(StringObject* str, ArrayObject* interfaces, Object* loader) { - int result = -1; + ClassObject* result = NULL; ArrayObject* throws = NULL; char* nameStr = dvmCreateCstrFromString(str); @@ -205,14 +205,13 @@ ClassObject* dvmGenerateProxyClass(StringObject* str, ArrayObject* interfaces, goto bail; } - result = 0; + result = newClass; bail: free(nameStr); - if (result != 0) { + if (result == NULL) { /* must free innards explicitly if we didn't finish linking */ dvmFreeClassInnards(newClass); - newClass = NULL; if (!dvmCheckException(dvmThreadSelf())) { /* throw something */ dvmThrowRuntimeException(NULL); @@ -223,7 +222,7 @@ bail: dvmReleaseTrackedAlloc((Object*) throws, NULL); dvmReleaseTrackedAlloc((Object*) newClass, NULL); - return newClass; + return result; } |