You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2013/06/26 06:41:21 UTC

svn commit: r1496730 - in /subversion/trunk/subversion/bindings/javahl/native: CommitCallback.cpp CommitCallback.h

Author: brane
Date: Wed Jun 26 04:41:20 2013
New Revision: 1496730

URL: http://svn.apache.org/r1496730
Log:
The remote API in JavaHL has to maintain references to the commit
callback for a moderately long time, so do maintain a global reference
to the obejct.

[in subversion/bindings/javahl/native]
* CommitCallback.h (CommitCallback.m_callback): Make protected.
  (PersistentCommitCallback): New, variant of CommitCallback.
* CommitCallback.cpp: Implement PersistentCommitCallback.

Modified:
    subversion/trunk/subversion/bindings/javahl/native/CommitCallback.cpp
    subversion/trunk/subversion/bindings/javahl/native/CommitCallback.h

Modified: subversion/trunk/subversion/bindings/javahl/native/CommitCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CommitCallback.cpp?rev=1496730&r1=1496729&r2=1496730&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CommitCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CommitCallback.cpp Wed Jun 26 04:41:20 2013
@@ -37,9 +37,8 @@
  * @param jcallback the Java callback object.
  */
 CommitCallback::CommitCallback(jobject jcallback)
-{
-  m_callback = jcallback;
-}
+  : m_callback(jcallback)
+{}
 
 /**
  * Destroy a CommitCallback object
@@ -102,3 +101,14 @@ CommitCallback::commitInfo(const svn_com
   env->PopLocalFrame(NULL);
   return SVN_NO_ERROR;
 }
+
+
+PersistentCommitCallback::PersistentCommitCallback(jobject jcallback)
+  : CommitCallback(JNIUtil::getEnv()->NewGlobalRef(jcallback))
+{}
+
+PersistentCommitCallback::~PersistentCommitCallback()
+{
+  if (m_callback)
+    JNIUtil::getEnv()->DeleteGlobalRef(m_callback);
+}

Modified: subversion/trunk/subversion/bindings/javahl/native/CommitCallback.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CommitCallback.h?rev=1496730&r1=1496729&r2=1496730&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CommitCallback.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CommitCallback.h Wed Jun 26 04:41:20 2013
@@ -47,11 +47,22 @@ class CommitCallback
   svn_error_t *commitInfo(const svn_commit_info_t *commit_info,
                           apr_pool_t *pool);
 
- private:
   /**
    * This a local reference to the Java object.
    */
   jobject m_callback;
 };
 
+/**
+ * Like CommitCallback, but maintains a reference to the Java object
+ * across JNI calls.
+ */
+class PersistentCommitCallback : protected CommitCallback
+{
+ public:
+  PersistentCommitCallback(jobject jcallback);
+  ~PersistentCommitCallback();
+  using CommitCallback::callback;
+};
+
 #endif  // COMMITCALLBACK_H