svn commit: r1004384 - in /subversion/trunk/subversion/bindings/javahl/native: SVNClient.cpp StatusCallback.cpp StatusCallback.h org_apache_subversion_javahl_SVNClient.cpp

[hwright]

Author: hwright
Date: Mon Oct  4 20:09:17 2010
New Revision: 1004384

URL: http://svn.apache.org/viewvc?rev=1004384&view=rev
Log:
Revert an improper r1004288, which was causing bindings test failures.

Modified:
    subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
    subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp
    subversion/trunk/subversion/bindings/javahl/native/StatusCallback.h
    
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp

Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=1004384&r1=1004383&r2=1004384&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Mon Oct  4 
20:09:17 2010
@@ -158,6 +158,7 @@ SVNClient::status(const char *path, svn_
     svn_client_ctx_t *ctx = context.getContext(NULL);
     if (ctx == NULL)
         return;
+    callback->setWcCtx(ctx->wc_ctx);
 
     Path checkedPath(path);
     SVN_JNI_ERR(checkedPath.error_occured(), );

Modified: subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp?rev=1004384&r1=1004383&r2=1004384&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp 
(original)
+++ subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp Mon 
Oct  4 20:09:17 2010
@@ -34,10 +34,9 @@
  * Create a StatusCallback object
  * @param jcallback the Java callback object.
  */
-StatusCallback::StatusCallback(jobject jcallback, svn_wc_context_t *wc_ctx)
+StatusCallback::StatusCallback(jobject jcallback)
 {
   m_callback = jcallback;
-  m_wc_ctx = wc_ctx;
 }
 
 /**
@@ -91,7 +90,7 @@ StatusCallback::doStatus(const char *loc
         POP_AND_RETURN(SVN_NO_ERROR);
     }
 
-  jobject jStatus = CreateJ::Status(m_wc_ctx, local_abspath, status, pool);
+  jobject jStatus = CreateJ::Status(wc_ctx, local_abspath, status, pool);
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN(SVN_NO_ERROR);
 
@@ -102,3 +101,9 @@ StatusCallback::doStatus(const char *loc
   env->PopLocalFrame(NULL);
   return SVN_NO_ERROR;
 }
+
+void
+StatusCallback::setWcCtx(svn_wc_context_t *wc_ctx_in)
+{
+  this->wc_ctx = wc_ctx_in;
+}

Modified: subversion/trunk/subversion/bindings/javahl/native/StatusCallback.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/StatusCallback.h?rev=1004384&r1=1004383&r2=1004384&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/StatusCallback.h 
(original)
+++ subversion/trunk/subversion/bindings/javahl/native/StatusCallback.h Mon Oct 
 4 20:09:17 2010
@@ -37,9 +37,11 @@
 class StatusCallback
 {
  public:
-  StatusCallback(jobject jcallback, svn_wc_context_t *wc_ctx);
+  StatusCallback(jobject jcallback);
   ~StatusCallback();
 
+  void setWcCtx(svn_wc_context_t *);
+
   static svn_error_t* callback(void *baton,
                                const char *local_abspath,
                                const svn_client_status_t *status,
@@ -56,7 +58,7 @@ class StatusCallback
    */
   jobject m_callback;
 
-  svn_wc_context_t *m_wc_ctx;
+  svn_wc_context_t *wc_ctx;
 };
 
 #endif // STATUSCALLBACK_H

Modified: 
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp?rev=1004384&r1=1004383&r2=1004384&view=diff
==============================================================================
--- 
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
 (original)
+++ 
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
 Mon Oct  4 20:09:17 2010
@@ -183,8 +183,7 @@ Java_org_apache_subversion_javahl_SVNCli
   if (JNIUtil::isExceptionThrown())
     return;
 
-  StatusCallback callback(jstatusCallback,
-                          cl->getClientContext().getContext(NULL)->wc_ctx);
+  StatusCallback callback(jstatusCallback);
   cl->status(path, EnumMapper::toDepth(jdepth),
              jonServer ? true:false,
              jgetAll ? true:false, jnoIgnore ? true:false,