svn commit: r1883407 - in /subversion/branches/1.14.x: ./ STATUS subversion/bindings/javahl/native/SVNBase.cpp

[svn-role]

Author: svn-role
Date: Sat Nov 14 04:00:17 2020
New Revision: 1883407

URL: http://svn.apache.org/viewvc?rev=1883407&view=rev
Log:
Merge r1882115 from trunk:

 * r1882115
   JavaHL: Fix incorrect cache in SVNBase::createCppBoundObject
   Justification:
     Fixes a potential crash.
   Votes:
     +1: hartmannathan, brane

Modified:
    subversion/branches/1.14.x/   (props changed)
    subversion/branches/1.14.x/STATUS
    subversion/branches/1.14.x/subversion/bindings/javahl/native/SVNBase.cpp

Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1882115

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1883407&r1=1883406&r2=1883407&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sat Nov 14 04:00:17 2020
@@ -110,10 +110,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1882115
-   JavaHL: Fix incorrect cache in SVNBase::createCppBoundObject
-   Justification:
-     Fixes a potential crash.
-   Votes:
-     +1: hartmannathan, brane

Modified: 
subversion/branches/1.14.x/subversion/bindings/javahl/native/SVNBase.cpp
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/javahl/native/SVNBase.cpp?rev=1883407&r1=1883406&r2=1883407&view=diff
==============================================================================
--- subversion/branches/1.14.x/subversion/bindings/javahl/native/SVNBase.cpp 
(original)
+++ subversion/branches/1.14.x/subversion/bindings/javahl/native/SVNBase.cpp 
Sat Nov 14 04:00:17 2020
@@ -107,13 +107,9 @@ jobject SVNBase::createCppBoundObject(co
   if (JNIUtil::isJavaExceptionThrown())
     return NULL;
 
-  static jmethodID ctor = 0;
-  if (ctor == 0)
-    {
-      ctor = env->GetMethodID(clazz, "<init>", "(J)V");
-      if (JNIUtil::isJavaExceptionThrown())
-        return NULL;
-    }
+  jmethodID ctor = env->GetMethodID(clazz, "<init>", "(J)V");
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
 
   jlong cppAddr = this->getCppAddr();