Author: brane
Date: Tue Jan 14 11:55:42 2014
New Revision: 1558016
URL: http://svn.apache.org/r1558016
Log:
On the javahl-1.8-extensions branch: Synced JavaHL from trunk up to r1558015.
Modified:
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/
(props changed)
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/Prompter.cpp
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/Prompter.h
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/SVNClient.cpp
Propchange:
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/
------------------------------------------------------------------------------
Merged /subversion/trunk/subversion/bindings/javahl:r1557926-1558015
Modified:
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/Prompter.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/Prompter.cpp?rev=1558016&r1=1558015&r2=1558016&view=diff
==============================================================================
---
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/Prompter.cpp
(original)
+++
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/Prompter.cpp
Tue Jan 14 11:55:42 2014
@@ -94,6 +94,11 @@ Prompter *Prompter::makeCPrompter(jobjec
return new Prompter(myPrompt);
}
+Prompter *Prompter::makeCPrompter(const Prompter& prompter)
+{
+ return makeCPrompter(prompter.m_prompter);
+}
+
/**
* Retrieve the username from the Java object
* @return Java string for the username or NULL
Modified:
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/Prompter.h
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/Prompter.h?rev=1558016&r1=1558015&r2=1558016&view=diff
==============================================================================
---
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/Prompter.h
(original)
+++
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/Prompter.h
Tue Jan 14 11:55:42 2014
@@ -55,6 +55,8 @@ class Prompter
bool m_maySave;
Prompter(jobject jprompter);
+ Prompter(const Prompter&) {}
+
bool prompt(const char *realm, const char *pi_username, bool maySave);
bool askYesNo(const char *realm, const char *question, bool yesIsDefault);
const char *askQuestion(const char *realm, const char *question,
@@ -95,6 +97,7 @@ class Prompter
apr_pool_t *pool);
public:
static Prompter *makeCPrompter(jobject jprompter);
+ static Prompter *makeCPrompter(const Prompter& prompter);
~Prompter();
svn_auth_provider_object_t *getProviderUsername(SVN::Pool &in_pool);
svn_auth_provider_object_t *getProviderSimple(SVN::Pool &in_pool);
Modified:
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/SVNClient.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/SVNClient.cpp?rev=1558016&r1=1558015&r2=1558016&view=diff
==============================================================================
---
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/SVNClient.cpp
(original)
+++
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/SVNClient.cpp
Tue Jan 14 11:55:42 2014
@@ -1513,7 +1513,7 @@ SVNClient::openRemoteSession(const char*
/* Decouple the RemoteSession's context from SVNClient's context
by creating a copy of the prompter here. */
- Prompter* prompter = new Prompter(context.getPrompter());
+ Prompter* prompter = Prompter::makeCPrompter(context.getPrompter());
if (!prompter)
return NULL;
