From 3534c7cb3d4c67e3a4f2925fc7ecec43aeed879a Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Fri, 14 May 2010 21:49:34 -0700 Subject: Remove ScopedGlobalRef (and other cleanups) ScopedGlobalRef caused more trouble that it was worth. Rather than trying to fix it to require updating of the JNIEnv, remove it to remove the temptation for others to use it. Also update SSL_set_ciphers_lists to use ScopedLocalRef and add HTML anchors to Standard names javadoc JSEE references. Change-Id: Ic3ed1bae3f29ee971d4461de31395b78c4949090 --- include/ScopedGlobalRef.h | 56 ----------------------------------------------- 1 file changed, 56 deletions(-) delete mode 100644 include/ScopedGlobalRef.h (limited to 'include') diff --git a/include/ScopedGlobalRef.h b/include/ScopedGlobalRef.h deleted file mode 100644 index 1fbeabb..0000000 --- a/include/ScopedGlobalRef.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef SCOPED_GLOBAL_REF_H_included -#define SCOPED_GLOBAL_REF_H_included - -#include "JNIHelp.h" - -// A smart pointer that creates a JNI global reference from a weak reference. -// The global reference is deleted when the smart pointer goes out of scope. -class ScopedGlobalRef { -public: - ScopedGlobalRef(JNIEnv* env, jobject localRef) - : mEnv(env), mGlobalRef(NULL) - { - mGlobalRef = env->NewGlobalRef(localRef); - } - - ~ScopedGlobalRef() { - reset(); - } - - void reset() { - if (mGlobalRef != NULL) { - mEnv->DeleteGlobalRef(mGlobalRef); - mGlobalRef = NULL; - } - } - - jobject get() const { - return mGlobalRef; - } - -private: - JNIEnv* mEnv; - jobject mGlobalRef; - - // Disallow copy and assignment. - ScopedGlobalRef(const ScopedGlobalRef&); - void operator=(const ScopedGlobalRef&); -}; - -#endif // SCOPED_GLOBAL_REF_H_included -- cgit v1.1