Merge r1935107 from trunk:

 * r1935107
   Fix a bug in JavaHL where native code could modify a final attribute.
   Votes:
     +1: brane, ivan


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.15.x@1936070 13f79535-47bb-0310-9956-ffa450edef68

Author: svn-role

STATUS

@@ -53,8 +53,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1935107
-   Fix a bug in JavaHL where native code could modify a final attribute.
-   Votes:
-     +1: brane, ivan

subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIObject.java

@@ -31,10 +31,15 @@ public abstract class JNIObject
      * slot for the address of the native peer. The JNI code controls this
      * field. If it is set to 0 then underlying JNI object has been freed
      */
-    protected final long cppAddr;
+    private long cppAddr = 0;
 
     protected JNIObject(long cppAddr)
     {
         this.cppAddr = cppAddr;
     }
+
+    protected long getCppAddr()
+    {
+        return cppAddr;
+    }
 }