Author: brane
Date: Tue Jun 9 06:18:21 2015
New Revision: 1684322
URL: http://svn.apache.org/r1684322
Log:
Fix a minor omission in JavaHL's VersionExtended class:
the dispose() and finalize() methods were missing.
[in subversion/bindings/javahl]
* src/org/apache/subversion/javahl/types/VersionExtended.java
(VersionExtended.dispose, VersionExtended.finalize): Add methods.
* VersionExtended.h
(VersionExtended::getCppObject): Return a non-const pointer;
the implementation of dispose() cannot use an immutable object.
* VersionExtended.cpp
(VersionExtended::getCppObject): Update implementation.
* org_apache_subversion_javahl_types_VersionExtended.cpp:
Include svn_private_config.h
(Java_org_apache_subversion_javahl_types_VersionExtended_dispose):
Implement native method.
* tests/org/apache/subversion/javahl/BasicTests.java
(BasicTests.testVersionExtendedQuiet,
BasicTests.testVersionExtendedVerbose): Dispose the VersionExtended object.
Modified:
subversion/trunk/subversion/bindings/javahl/native/VersionExtended.cpp
subversion/trunk/subversion/bindings/javahl/native/VersionExtended.h
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Modified: subversion/trunk/subversion/bindings/javahl/native/VersionExtended.cpp
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/VersionExtended.cpp?rev=1684322&r1=1684321&r2=1684322&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/VersionExtended.cpp
(original)
+++ subversion/trunk/subversion/bindings/javahl/native/VersionExtended.cpp Tue
Jun 9 06:18:21 2015
@@ -27,7 +27,7 @@
#include "JNIUtil.h"
#include "VersionExtended.h"
-const VersionExtended *
+VersionExtended *
VersionExtended::getCppObject(jobject jthis)
{
if (!jthis)
Modified: subversion/trunk/subversion/bindings/javahl/native/VersionExtended.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/VersionExtended.h?rev=1684322&r1=1684321&r2=1684322&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/VersionExtended.h
(original)
+++ subversion/trunk/subversion/bindings/javahl/native/VersionExtended.h Tue
Jun 9 06:18:21 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/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp?rev=1684322&r1=1684321&r2=1684322&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp
(original)
+++
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp
Tue Jun 9 06:18:21 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/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java?rev=1684322&r1=1684321&r2=1684322&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java
Tue Jun 9 06:18:21 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/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1684322&r1=1684321&r2=1684322&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Tue Jun 9 06:18:21 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();
+ }
}
/**
