svn commit: r1831143 - in /subversion/branches/1.10.x: ./ STATUS subversion/bindings/javahl/native/jniwrapper/jni_list.hpp

[svn-role]

Author: svn-role
Date: Tue May  8 04:00:08 2018
New Revision: 1831143

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

* r1828613
  Fix a JavaHL local refs capacity warning when unparsing externals.
  Justification:
    Prevents overflow of the JNI local references stack.
  Votes:
    +1: brane, stsp

Modified:
    subversion/branches/1.10.x/   (props changed)
    subversion/branches/1.10.x/STATUS
    
subversion/branches/1.10.x/subversion/bindings/javahl/native/jniwrapper/jni_list.hpp

Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May  8 04:00:08 2018
@@ -101,4 +101,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1825979,1826720-1826721,1826747,1826811,1826814,1826877,1826907,1826971,1827105,1827114,1827191,1827562,1827574,1827670,1829012,1829015
+/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1825979,1826720-1826721,1826747,1826811,1826814,1826877,1826907,1826971,1827105,1827114,1827191,1827562,1827574,1827670,1828613,1829012,1829015

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1831143&r1=1831142&r2=1831143&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue May  8 04:00:08 2018
@@ -57,10 +57,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
-* r1828613
-  Fix a JavaHL local refs capacity warning when unparsing externals.
-  Justification:
-    Prevents overflow of the JNI local references stack.
-  Votes:
-    +1: brane, stsp

Modified: 
subversion/branches/1.10.x/subversion/bindings/javahl/native/jniwrapper/jni_list.hpp
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/bindings/javahl/native/jniwrapper/jni_list.hpp?rev=1831143&r1=1831142&r2=1831143&view=diff
==============================================================================
--- 
subversion/branches/1.10.x/subversion/bindings/javahl/native/jniwrapper/jni_list.hpp
 (original)
+++ 
subversion/branches/1.10.x/subversion/bindings/javahl/native/jniwrapper/jni_list.hpp
 Tue May  8 04:00:08 2018
@@ -173,7 +173,10 @@ public:
     {
       Iterator iter(get_iterator());
       while (iter.has_next())
-        function(T(m_env, NativeT(iter.next())));
+        {
+          ::Java::LocalFrame frame(m_env);
+          function(T(m_env, NativeT(iter.next())));
+        }
       return function;
     }
 };