Author: svn-role
Date: Wed Jun 10 04:00:23 2015
New Revision: 1684556
URL: http://svn.apache.org/r1684556
Log:
Merge r1684322 from trunk:
* r1684322
Fix a minor omission in JavaHL's VersionExtended class:
the dispose() and finalize() methods were missing.
Justification:
Without the dispose() method, the user of the VersionExtended
class cannot avoid a memory leak in native memory.
Note:
VersionExtended is new in 1.9. If we release it without
the dispose() and finalize() methods, the bug will have to
persist to 1.10, because adding the methods would be
a public API change.
Votes:
+1: brane, rhuijben
Modified:
subversion/branches/1.9.x/ (props changed)
subversion/branches/1.9.x/STATUS
subversion/branches/1.9.x/subversion/bindings/javahl/native/VersionExtended.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/native/VersionExtended.h
subversion/branches/1.9.x/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java
subversion/branches/1.9.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 10 04:00:23 2015
@@ -93,4 +93,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669743,1669746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,167
0347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674627,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1683071,1683311,1683387,1684034
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669743,1669746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,167
0347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674627,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1683071,1683311,1683387,1684034,1684322
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1684556&r1=1684555&r2=1684556&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Wed Jun 10 04:00:23 2015
@@ -70,20 +70,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1684322
- Fix a minor omission in JavaHL's VersionExtended class:
- the dispose() and finalize() methods were missing.
- Justification:
- Without the dispose() method, the user of the VersionExtended
- class cannot avoid a memory leak in native memory.
- Note:
- VersionExtended is new in 1.9. If we release it without
- the dispose() and finalize() methods, the bug will have to
- persist to 1.10, because adding the methods would be
- a public API change.
- Votes:
- +1: brane, rhuijben
-
* r1684077
Detect invalid svndiff data earlier.
Justification:
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/VersionExtended.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/VersionExtended.cpp?rev=1684556&r1=1684555&r2=1684556&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/VersionExtended.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/VersionExtended.cpp
Wed Jun 10 04:00:23 2015
@@ -27,7 +27,7 @@
#include "JNIUtil.h"
#include "VersionExtended.h"
-const VersionExtended *
+VersionExtended *
VersionExtended::getCppObject(jobject jthis)
{
if (!jthis)
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/VersionExtended.h
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/VersionExtended.h?rev=1684556&r1=1684555&r2=1684556&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/VersionExtended.h
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/VersionExtended.h
Wed Jun 10 04:00:23 2015
@@ -33,7 +33,7 @@
class VersionExtended : public SVNBase
{
public:
- static const VersionExtended *getCppObject(jobject jthis);
+ static VersionExtended *getCppObject(jobject jthis);
static const VersionExtended *getCppObjectFromLinkedLib(jobject jthat);
static const VersionExtended *getCppObjectFromLoadedLib(jobject jthat);
static const VersionExtended *getCppObjectFromLinkedLibIterator(jobject
jthat);
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp?rev=1684556&r1=1684555&r2=1684556&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp
Wed Jun 10 04:00:23 2015
@@ -33,8 +33,24 @@
#include "JNIStackElement.h"
#include <string>
+#include "svn_private_config.h"
+
// VersionExtended native methods
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_types_VersionExtended_dispose(
+ JNIEnv *env, jobject jthis)
+{
+ JNIEntry(VersionExtended, dispose);
+ VersionExtended *const vx = VersionExtended::getCppObject(jthis);
+ if (vx == NULL)
+ {
+ JNIUtil::throwError(_("bad C++ this"));
+ return;
+ }
+ vx->dispose(jthis);
+}
+
JNIEXPORT jstring JNICALL
Java_org_apache_subversion_javahl_types_VersionExtended_getBuildDate(
JNIEnv *env, jobject jthis)
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java?rev=1684556&r1=1684555&r2=1684556&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java
Wed Jun 10 04:00:23 2015
@@ -41,6 +41,21 @@ public class VersionExtended
}
/**
+ * Release the native peer. This method must be called to release
+ * the native resources held by this object.
+ * <p>
+ * Once this method is called, all object references obtained from
+ * the iterators returned by {@link #getLinkedLibs()} and
+ * {@link #getLoadedLibs()} become invalid and should no longer be used.
+ */
+ public native void dispose();
+
+ /**
+ * release the native peer (should use dispose instead)
+ */
+ public native void finalize();
+
+ /**
* @return The date when the libsvn_subr library was compiled, in
* the format defined by the C standard macro #__DATE__.
*/
Modified:
subversion/branches/1.9.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1684556&r1=1684555&r2=1684556&view=diff
==============================================================================
---
subversion/branches/1.9.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
(original)
+++
subversion/branches/1.9.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Wed Jun 10 04:00:23 2015
@@ -139,9 +139,10 @@ public class BasicTests extends SVNTests
*/
public void testVersionExtendedQuiet() throws Throwable
{
+ VersionExtended vx = null;
try
{
- VersionExtended vx = client.getVersionExtended(false);
+ vx = client.getVersionExtended(false);
String result = vx.getBuildDate();
if (result == null || result.trim().length() == 0)
throw new Exception("Build date empty");
@@ -160,6 +161,11 @@ public class BasicTests extends SVNTests
fail("VersionExtended should always be available unless the " +
"native libraries failed to initialize: " + e);
}
+ finally
+ {
+ if (vx != null)
+ vx.dispose();
+ }
}
/**
@@ -168,9 +174,10 @@ public class BasicTests extends SVNTests
*/
public void testVersionExtendedVerbose() throws Throwable
{
+ VersionExtended vx = null;
try
{
- VersionExtended vx = client.getVersionExtended(true);
+ vx = client.getVersionExtended(true);
String result = vx.getRuntimeHost();
if (result == null || result.trim().length() == 0)
throw new Exception("Runtime host empty");
@@ -216,6 +223,11 @@ public class BasicTests extends SVNTests
fail("VersionExtended should always be available unless the " +
"native libraries failed to initialize: " + e);
}
+ finally
+ {
+ if (vx != null)
+ vx.dispose();
+ }
}
/**
