svn commit: r1936070 - in subversion/branches/1.15.x: . subversion/bindings/javahl/src/org/apache/subversion/javahl

[svn-role]

Author: svn-role
Date: Sun Jul 12 04:00:10 2026
New Revision: 1936070

Log:
Merge r1935107 from trunk:

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

Modified:
   subversion/branches/1.15.x/   (props changed)
   subversion/branches/1.15.x/STATUS
   
subversion/branches/1.15.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIObject.java

Modified: subversion/branches/1.15.x/STATUS
==============================================================================
--- subversion/branches/1.15.x/STATUS   Sun Jul 12 02:53:33 2026        
(r1936069)
+++ subversion/branches/1.15.x/STATUS   Sun Jul 12 04:00:10 2026        
(r1936070)
@@ -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

Modified: 
subversion/branches/1.15.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIObject.java
==============================================================================
--- 
subversion/branches/1.15.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIObject.java
       Sun Jul 12 02:53:33 2026        (r1936069)
+++ 
subversion/branches/1.15.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIObject.java
       Sun Jul 12 04:00:10 2026        (r1936070)
@@ -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;
+    }
 }