svn commit: r990921 - /subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp

[hw...@apache.org]

Author: hwright
Date: Mon Aug 30 19:47:50 2010
New Revision: 990921

URL: http://svn.apache.org/viewvc?rev=990921&view=rev
Log:
Remove the separate target for invoking the JavaHL compat tests, and fold
them into the standard JavaHL test target.  Run the standard tests before
the compat ones.

* Makefile.in
  (check-javahl): Run both compat and standard tests.
  (check-javahl-compat): Remove.

Modified:
    subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp

Modified: subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp?rev=990921&r1=990920&r2=990921&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp Mon Aug 30 19:47:50 2010
@@ -56,6 +56,16 @@ ClientContext::ClientContext()
     /* Create a long-lived client context object in the global pool. */
     SVN_JNI_ERR(svn_client_create_context(&persistentCtx, JNIUtil::getPool()),
                 );
+
+    /* None of the following members change during the lifetime of
+       this object. */
+    persistentCtx->notify_func = NULL;
+    persistentCtx->notify_baton = NULL;
+    persistentCtx->log_msg_func3 = getCommitMessage;
+    persistentCtx->cancel_func = checkCancel;
+    persistentCtx->cancel_baton = this;
+    persistentCtx->notify_func2= ClientNotifyCallback::notify;
+    persistentCtx->progress_func = ProgressListener::progress;
 }
 
 ClientContext::~ClientContext()
@@ -173,17 +183,10 @@ ClientContext::getContext(const char *me
                                m_passWord.c_str());
 
     ctx->auth_baton = ab;
-    ctx->notify_func = NULL;
-    ctx->notify_baton = NULL;
-    ctx->log_msg_func3 = getCommitMessage;
     ctx->log_msg_baton3 = getCommitMessageBaton(message);
-    ctx->cancel_func = checkCancel;
-    m_cancelOperation = false;
-    ctx->cancel_baton = this;
-    ctx->notify_func2= ClientNotifyCallback::notify;
     ctx->notify_baton2 = m_notify2;
+    m_cancelOperation = false;
 
-    ctx->progress_func = ProgressListener::progress;
     ctx->progress_baton = m_progressListener;
 
     if (m_conflictResolver)