svn commit: r1098743 - in /subversion/trunk/subversion/bindings/javahl/native: ClientContext.cpp ClientContext.h

[hwright]

Author: hwright
Date: Mon May  2 19:10:50 2011
New Revision: 1098743

URL: http://svn.apache.org/viewvc?rev=1098743&view=rev
Log:
JavaHL: Update the resolver function type to accept a
svn_wc_conflict_description2_t.

* subversion/bindings/javahl/native/ClientContext.h
  (resolve): Update function prototype.
 
* subversion/bindings/javahl/native/ClientContext.cpp
  (ClientContext): Use the updated handlers in the client context.
  (resolve): Update params, and don't convert to the old type.

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

Modified: subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp?rev=1098743&r1=1098742&r2=1098743&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp 
(original)
+++ subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp Mon 
May  2 19:10:50 2011
@@ -87,8 +87,8 @@ ClientContext::ClientContext(jobject jsv
     persistentCtx->notify_baton2 = m_jctx;
     persistentCtx->progress_func = progress;
     persistentCtx->progress_baton = m_jctx;
-    persistentCtx->conflict_func = resolve;
-    persistentCtx->conflict_baton = m_jctx;
+    persistentCtx->conflict_func2 = resolve;
+    persistentCtx->conflict_baton2 = m_jctx;
 }
 
 ClientContext::~ClientContext()
@@ -348,9 +348,10 @@ ClientContext::progress(apr_off_t progre
 
 svn_error_t *
 ClientContext::resolve(svn_wc_conflict_result_t **result,
-                       const svn_wc_conflict_description_t *desc,
+                       const svn_wc_conflict_description2_t *desc,
                        void *baton,
-                       apr_pool_t *pool)
+                       apr_pool_t *result_pool,
+                       apr_pool_t *scratch_pool)
 {
   jobject jctx = (jobject) baton;
   JNIEnv *env = JNIUtil::getEnv();
@@ -375,7 +376,7 @@ ClientContext::resolve(svn_wc_conflict_r
     }
 
   // Create an instance of the conflict descriptor.
-  jobject jdesc = CreateJ::ConflictDescriptor(svn_wc__cd_to_cd2(desc, pool));
+  jobject jdesc = CreateJ::ConflictDescriptor(desc);
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN(SVN_NO_ERROR);
 
@@ -392,7 +393,7 @@ ClientContext::resolve(svn_wc_conflict_r
       return err;
     }
 
-  *result = javaResultToC(jresult, pool);
+  *result = javaResultToC(jresult, result_pool);
   if (*result == NULL)
     {
       // Unable to convert the result into a C representation.

Modified: subversion/trunk/subversion/bindings/javahl/native/ClientContext.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ClientContext.h?rev=1098743&r1=1098742&r2=1098743&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ClientContext.h 
(original)
+++ subversion/trunk/subversion/bindings/javahl/native/ClientContext.h Mon May  
2 19:10:50 2011
@@ -62,9 +62,10 @@ class ClientContext
   static void progress(apr_off_t progressVal, apr_off_t total,
                        void *baton, apr_pool_t *pool);
   static svn_error_t *resolve(svn_wc_conflict_result_t **result,
-                              const svn_wc_conflict_description_t *desc,
+                              const svn_wc_conflict_description2_t *desc,
                               void *baton,
-                              apr_pool_t *pool);
+                              apr_pool_t *result_pool,
+                              apr_pool_t *scratch_pool);
   static svn_wc_conflict_result_t *javaResultToC(jobject result,
                                                  apr_pool_t *pool);