Author: vmpn
Date: Mon Dec 24 01:08:43 2012
New Revision: 1425568
URL: http://svn.apache.org/viewvc?rev=1425568&view=rev
Log:
On the javahl-ra branch:
Bring up-to-date with trunk@1398941
Modified:
subversion/branches/javahl-ra/ (props changed)
subversion/branches/javahl-ra/subversion/bindings/javahl/native/ClientContext.cpp
Propchange: subversion/branches/javahl-ra/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1398941
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/native/ClientContext.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/ClientContext.cpp?rev=1425568&r1=1425567&r2=1425568&view=diff
==============================================================================
---
subversion/branches/javahl-ra/subversion/bindings/javahl/native/ClientContext.cpp
(original)
+++
subversion/branches/javahl-ra/subversion/bindings/javahl/native/ClientContext.cpp
Mon Dec 24 01:08:43 2012
@@ -44,7 +44,8 @@ ClientContext::ClientContext(jobject jsv
static jfieldID ctxFieldID = 0;
attachJavaObject(jsvnclient, "L"JAVA_PACKAGE"/SVNClient$ClientContext;",
"clientContext", &ctxFieldID);
- SVN_JNI_ERR(svn_client_create_context(&m_context, pool.getPool()),
+ SVN_JNI_ERR(svn_client_create_context2(&m_context, NULL,
+ pool.getPool()),
);
/* Clear the wc_ctx as we don't want to maintain this unconditionally
