svn commit: r1605720 - in /subversion/trunk/subversion/bindings/javahl/native: RemoteSession.cpp RemoteSessionContext.cpp org_apache_subversion_javahl_util_ConfigImpl_Category.cpp

[br...@apache.org]

Author: brane
Date: Thu Jun 26 09:51:27 2014
New Revision: 1605720

URL: http://svn.apache.org/r1605720
Log:
Remove some instances of invalid dereferencing of local
JNI object references in JavaHL.

[in subversion/bindings/javahl/native]
* RemoteSession.cpp (RemoteSession::open):
   Do not dereference jstring parameters. Remove the now unused
   local variable 'env'.
* RemoteSessionContext.cpp (RemoteSessionContext::activate):
   Do not dereference the jobject parameter.
* org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
  (ImplContext::ImplContext): Do not dereference jstring parameters.

Modified:
    subversion/trunk/subversion/bindings/javahl/native/RemoteSession.cpp
    subversion/trunk/subversion/bindings/javahl/native/RemoteSessionContext.cpp
    subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp

Modified: subversion/trunk/subversion/bindings/javahl/native/RemoteSession.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/RemoteSession.cpp?rev=1605720&r1=1605719&r2=1605720&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/RemoteSession.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/RemoteSession.cpp Thu Jun 26 09:51:27 2014
@@ -73,35 +73,28 @@ RemoteSession::open(jint jretryAttempts,
 {
   SVN_ERR_ASSERT_NO_RETURN(!jprompter != !jdeprecatedPrompter);
 
-  JNIEnv *env = JNIUtil::getEnv();
-
   SVN::Pool requestPool;
   URL url(jurl, requestPool);
   if (JNIUtil::isExceptionThrown())
     return NULL;
   SVN_JNI_ERR(url.error_occurred(), NULL);
-  env->DeleteLocalRef(jurl);
 
   JNIStringHolder uuid(juuid);
   if (JNIUtil::isExceptionThrown())
     return NULL;
-  env->DeleteLocalRef(juuid);
 
   Path configDirectory(jconfigDirectory, requestPool);
   if (JNIUtil::isExceptionThrown())
     return NULL;
   SVN_JNI_ERR(configDirectory.error_occurred(), NULL);
-  env->DeleteLocalRef(jconfigDirectory);
 
   JNIStringHolder usernameStr(jusername);
   if (JNIUtil::isExceptionThrown())
     return NULL;
-  env->DeleteLocalRef(jusername);
 
   JNIStringHolder passwordStr(jpassword);
   if (JNIUtil::isExceptionThrown())
     return NULL;
-  env->DeleteLocalRef(jpassword);
 
   Prompter::UniquePtr prompter(jprompter ? Prompter::create(jprompter)
                                : CompatPrompter::create(jdeprecatedPrompter));

Modified: subversion/trunk/subversion/bindings/javahl/native/RemoteSessionContext.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/RemoteSessionContext.cpp?rev=1605720&r1=1605719&r2=1605720&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/RemoteSessionContext.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/RemoteSessionContext.cpp Thu Jun 26 09:51:27 2014
@@ -109,7 +109,6 @@ void RemoteSessionContext::activate(jobj
     return;
 
   env->CallVoidMethod(m_jctx, mid, jprogress);
-  env->DeleteLocalRef(jprogress);
   m_raCallbacks->progress_baton = m_jctx;
 }
 

Modified: subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp?rev=1605720&r1=1605719&r2=1605720&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp Thu Jun 26 09:51:27 2014
@@ -77,10 +77,6 @@ struct ImplContext
         return;
       if (option.c_str())
         m_option = option.c_str();
-
-      env->DeleteLocalRef(jcategory);
-      env->DeleteLocalRef(jsection);
-      env->DeleteLocalRef(joption);
     }
 
   svn_config_t* m_config;