Improve the BaseDexClassLoader detail message, and make ScopedLocalRef more unique_ptr-like.

(cherry-pick of 1c459db4ea31c1f284353bc71bfd2dbc97ca53d7.)

Conflicts:

	include/ScopedLocalRef.h

Change-Id: Id01cb907406cc93f6b0f6ddaa8e7fb3714d18c53

1 files changed, 13 insertions, 7 deletions

diff --git a/include/ScopedLocalRef.h b/include/ScopedLocalRef.h
index 84ee11a..e239b9e 100644
--- a/include/ScopedLocalRef.h
+++ b/include/ScopedLocalRef.h
@@ -23,22 +23,28 @@
 template<typename T>
 class ScopedLocalRef {
 public:
-    ScopedLocalRef(JNIEnv* env, T localRef)
-    : mEnv(env), mLocalRef(localRef)
-    {
+    ScopedLocalRef(JNIEnv* env, T localRef) : mEnv(env), mLocalRef(localRef) {
     }
 
     ~ScopedLocalRef() {
         reset();
     }
 
-    void reset() {
-        if (mLocalRef != NULL) {
-            mEnv->DeleteLocalRef(mLocalRef);
-            mLocalRef = NULL;
+    void reset(T ptr = NULL) {
+        if (ptr != mLocalRef) {
+            if (mLocalRef != NULL) {
+                mEnv->DeleteLocalRef(mLocalRef);
+            }
+            mLocalRef = ptr;
         }
     }
 
+    T release() __attribute__((warn_unused_result)) {
+        T localRef = mLocalRef;
+        mLocalRef = NULL;
+        return localRef;
+    }
+
     T get() const {
         return mLocalRef;
     }