On the 1.7.x-JavaHL-pools branch: Properly resolve the merge conflict that
made me create a branch.

Found by: markphip

* subversion/bindings/javahl/native/SVNClient.cpp
  (propertySetRemote): Provide the log message instead of NULL.  

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-JavaHL-pools@1158696 13f79535-47bb-0310-9956-ffa450edef68

subversion/bindings/javahl/native/SVNClient.cpp

diff --git a/subversion/bindings/javahl/native/SVNClient.cpp b/subversion/bindings/javahl/native/SVNClient.cpp
index 4d83078..7cc31c2 100644
--- a/subversion/bindings/javahl/native/SVNClient.cpp
+++ b/subversion/bindings/javahl/native/SVNClient.cpp
@@ -918,7 +918,7 @@
     Path intPath(path, subPool);
     SVN_JNI_ERR(intPath.error_occured(), );
 
-    svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
+    svn_client_ctx_t *ctx = context.getContext(message, subPool);
     if (ctx == NULL)
         return;