You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/08/05 12:12:00 UTC
svn commit: r1154155 - in /subversion/trunk/subversion/bindings/javahl:
native/ src/org/apache/subversion/javahl/
Author: rhuijben
Date: Fri Aug 5 10:12:00 2011
New Revision: 1154155
URL: http://svn.apache.org/viewvc?rev=1154155&view=rev
Log:
In JavaHL: Rename Pool.pool() function to Pool.getPool(). This function name
was safe when the class was still called SVNPool (< 1.7), but as Pool
functions shouldn't use the class name.
* subversion/bindings/javahl/native/Pool.cpp
* subversion/bindings/javahl/native/Pool.h
Remove unused variable. Update documentation.
* subversion/bindings/javahl/native/ClientContext.cpp
* subversion/bindings/javahl/native/CopySources.cpp
* subversion/bindings/javahl/native/File.cpp
* subversion/bindings/javahl/native/InputStream.cpp
* subversion/bindings/javahl/native/JNIUtil.cpp
* subversion/bindings/javahl/native/JNIUtil.h
* subversion/bindings/javahl/native/libsvnjavahl.la.c
* subversion/bindings/javahl/native/OutputStream.cpp
* subversion/bindings/javahl/native/Path.cpp
* subversion/bindings/javahl/native/Prompter.cpp
* subversion/bindings/javahl/native/RevisionRange.cpp
* subversion/bindings/javahl/native/RevpropTable.cpp
* subversion/bindings/javahl/native/StringArray.cpp
* subversion/bindings/javahl/native/SVNClient.cpp
* subversion/bindings/javahl/native/SVNRepos.cpp
* subversion/bindings/javahl/native/Targets.cpp
* subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
Update callers.
Modified:
subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp
subversion/trunk/subversion/bindings/javahl/native/CopySources.cpp
subversion/trunk/subversion/bindings/javahl/native/File.cpp
subversion/trunk/subversion/bindings/javahl/native/InputStream.cpp
subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h
subversion/trunk/subversion/bindings/javahl/native/OutputStream.cpp
subversion/trunk/subversion/bindings/javahl/native/Path.cpp
subversion/trunk/subversion/bindings/javahl/native/Pool.cpp
subversion/trunk/subversion/bindings/javahl/native/Pool.h
subversion/trunk/subversion/bindings/javahl/native/Prompter.cpp
subversion/trunk/subversion/bindings/javahl/native/RevisionRange.cpp
subversion/trunk/subversion/bindings/javahl/native/RevpropTable.cpp
subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
subversion/trunk/subversion/bindings/javahl/native/SVNRepos.cpp
subversion/trunk/subversion/bindings/javahl/native/StringArray.cpp
subversion/trunk/subversion/bindings/javahl/native/Targets.cpp
subversion/trunk/subversion/bindings/javahl/native/libsvnjavahl.la.c
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
Modified: subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp?rev=1154155&r1=1154154&r2=1154155&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp Fri Aug 5 10:12:00 2011
@@ -236,7 +236,7 @@ ClientContext::setConfigDirectory(const
// A change to the config directory may necessitate creation of
// the config templates.
SVN::Pool requestPool;
- SVN_JNI_ERR(svn_config_ensure(configDir, requestPool.pool()), );
+ SVN_JNI_ERR(svn_config_ensure(configDir, requestPool.getPool()), );
m_configDir = (configDir == NULL ? "" : configDir);
}
Modified: subversion/trunk/subversion/bindings/javahl/native/CopySources.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CopySources.cpp?rev=1154155&r1=1154154&r2=1154155&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CopySources.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CopySources.cpp Fri Aug 5 10:12:00 2011
@@ -85,7 +85,7 @@ CopySources::makeJCopySource(const char
apr_array_header_t *
CopySources::array(SVN::Pool &pool)
{
- apr_pool_t *p = pool.pool();
+ apr_pool_t *p = pool.getPool();
JNIEnv *env = JNIUtil::getEnv();
jclass clazz = env->FindClass(JAVA_PACKAGE "/types/CopySource");
@@ -122,7 +122,7 @@ CopySources::array(SVN::Pool &pool)
src->path = apr_pstrdup(p, path);
env->ReleaseStringUTFChars(jpath, path);
- SVN_JNI_ERR(JNIUtil::preprocessPath(src->path, pool.pool()),
+ SVN_JNI_ERR(JNIUtil::preprocessPath(src->path, pool.getPool()),
NULL);
env->DeleteLocalRef(jpath);
Modified: subversion/trunk/subversion/bindings/javahl/native/File.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/File.cpp?rev=1154155&r1=1154154&r2=1154155&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/File.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/File.cpp Fri Aug 5 10:12:00 2011
@@ -90,7 +90,7 @@ const char *File::getInternalStyle(const
{
const char *path = getAbsPath();
if (path)
- return svn_dirent_internal_style(path, requestPool.pool());
+ return svn_dirent_internal_style(path, requestPool.getPool());
else
return NULL;
}
Modified: subversion/trunk/subversion/bindings/javahl/native/InputStream.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/InputStream.cpp?rev=1154155&r1=1154154&r2=1154155&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/InputStream.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/InputStream.cpp Fri Aug 5 10:12:00 2011
@@ -53,7 +53,7 @@ svn_stream_t *InputStream::getStream(con
{
// Create a stream with this as the baton and set the read and
// close functions.
- svn_stream_t *ret = svn_stream_create(this, pool.pool());
+ svn_stream_t *ret = svn_stream_create(this, pool.getPool());
svn_stream_set_read(ret, InputStream::read);
svn_stream_set_close(ret, InputStream::close);
return ret;
Modified: subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp?rev=1154155&r1=1154154&r2=1154155&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp Fri Aug 5 10:12:00 2011
@@ -636,7 +636,7 @@ JNIUtil::thrownExceptionToCString(SVN::P
}
jstring jmsg = (jstring) env->CallObjectMethod(t, getMessage);
JNIStringHolder tmp(jmsg);
- msg = tmp.pstrdup(in_pool.pool());
+ msg = tmp.pstrdup(in_pool.getPool());
// ### Conditionally add t.printStackTrace() to msg?
}
else
Modified: subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h?rev=1154155&r1=1154154&r2=1154155&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h Fri Aug 5 10:12:00 2011
@@ -133,6 +133,7 @@ class JNIUtil
static apr_pool_t *getPool();
static bool JNIGlobalInit(JNIEnv *env);
static bool JNIInit(JNIEnv *env);
+ static bool initializeJNIRuntime();
enum { formatBufferSize = 2048 };
enum { noLog, errorLog, exceptionLog, entryLog } LogLevel;
Modified: subversion/trunk/subversion/bindings/javahl/native/OutputStream.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/OutputStream.cpp?rev=1154155&r1=1154154&r2=1154155&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/OutputStream.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/OutputStream.cpp Fri Aug 5 10:12:00 2011
@@ -56,7 +56,7 @@ svn_stream_t *OutputStream::getStream(co
{
// Create a stream with this as the baton and set the write and
// close functions.
- svn_stream_t *ret = svn_stream_create(this, pool.pool());
+ svn_stream_t *ret = svn_stream_create(this, pool.getPool());
svn_stream_set_write(ret, OutputStream::write);
svn_stream_set_close(ret, OutputStream::close);
return ret;
Modified: subversion/trunk/subversion/bindings/javahl/native/Path.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/Path.cpp?rev=1154155&r1=1154154&r2=1154155&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/Path.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/Path.cpp Fri Aug 5 10:12:00 2011
@@ -78,7 +78,7 @@ Path::init(const char *pi_path, SVN::Poo
}
else
{
- m_error_occured = JNIUtil::preprocessPath(pi_path, in_pool.pool());
+ m_error_occured = JNIUtil::preprocessPath(pi_path, in_pool.getPool());
m_path = pi_path;
}
@@ -125,7 +125,7 @@ jboolean Path::isValid(const char *p)
return JNI_FALSE;
SVN::Pool requestPool;
- svn_error_t *err = svn_path_check_valid(p, requestPool.pool());
+ svn_error_t *err = svn_path_check_valid(p, requestPool.getPool());
if (err == SVN_NO_ERROR)
{
return JNI_TRUE;
Modified: subversion/trunk/subversion/bindings/javahl/native/Pool.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/Pool.cpp?rev=1154155&r1=1154154&r2=1154155&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/Pool.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/Pool.cpp Fri Aug 5 10:12:00 2011
@@ -31,25 +31,27 @@
#include "svn_pools.h"
/**
- * Constructor to create one apr pool as the subpool of the global pool
- * store this pool as the request pool.
+ * Constructor to create one apr pool as the subpool of the global pool.
*/
SVN::Pool::Pool()
{
m_pool = svn_pool_create(JNIUtil::getPool());
- m_request_pool = true;
}
+/**
+ * Constructor to create one apr pool as a subpool of the passed pool.
+ */
SVN::Pool::Pool(const Pool &parent_pool)
{
m_pool = svn_pool_create(parent_pool.m_pool);
- m_request_pool = false;
}
+/**
+ * Constructor to create one apr pool as a subpool of the passed pool.
+ */
SVN::Pool::Pool(apr_pool_t *parent_pool)
{
m_pool = svn_pool_create(parent_pool);
- m_request_pool = false;
}
/**
@@ -65,7 +67,3 @@ SVN::Pool::~Pool()
}
}
-apr_pool_t* SVN::Pool::getPool()
-{
- return m_pool;
-}
Modified: subversion/trunk/subversion/bindings/javahl/native/Pool.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/Pool.h?rev=1154155&r1=1154154&r2=1154155&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/Pool.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/Pool.h Fri Aug 5 10:12:00 2011
@@ -42,12 +42,9 @@ namespace SVN {
Pool(const Pool &parent_pool);
Pool(apr_pool_t *parent_pool);
~Pool();
- apr_pool_t *pool() const;
+ apr_pool_t *getPool() const;
void clear() const;
- public:
- apr_pool_t* getPool();
-
private:
/**
* The apr pool request pool.
@@ -55,12 +52,6 @@ namespace SVN {
apr_pool_t *m_pool;
/**
- * Boolean indicating whether this pool is a request pool vs just a normal
- * subpool.
- */
- bool m_request_pool;
-
- /**
* We declare the assignment operator private here, so that the compiler
* won't inadvertently use them for us.
* The default code just copies all the data members, which would create
@@ -76,7 +67,7 @@ namespace SVN {
// need to be implemented in the header file for that to happen.
inline
- apr_pool_t *Pool::pool() const
+ apr_pool_t *Pool::getPool() const
{
return m_pool;
}
Modified: subversion/trunk/subversion/bindings/javahl/native/Prompter.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/Prompter.cpp?rev=1154155&r1=1154154&r2=1154155&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/Prompter.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/Prompter.cpp Fri Aug 5 10:12:00 2011
@@ -363,7 +363,7 @@ bool Prompter::prompt(const char *realm,
svn_auth_provider_object_t *Prompter::getProviderSimple(SVN::Pool &in_pool)
{
- apr_pool_t *pool = in_pool.pool();
+ apr_pool_t *pool = in_pool.getPool();
svn_auth_provider_object_t *provider;
svn_auth_get_simple_prompt_provider(&provider,
simple_prompt,
@@ -376,7 +376,7 @@ svn_auth_provider_object_t *Prompter::ge
svn_auth_provider_object_t *Prompter::getProviderUsername(SVN::Pool &in_pool)
{
- apr_pool_t *pool = in_pool.pool();
+ apr_pool_t *pool = in_pool.getPool();
svn_auth_provider_object_t *provider;
svn_auth_get_username_prompt_provider(&provider,
username_prompt,
@@ -389,7 +389,7 @@ svn_auth_provider_object_t *Prompter::ge
svn_auth_provider_object_t *Prompter::getProviderServerSSLTrust(SVN::Pool &in_pool)
{
- apr_pool_t *pool = in_pool.pool();
+ apr_pool_t *pool = in_pool.getPool();
svn_auth_provider_object_t *provider;
svn_auth_get_ssl_server_trust_prompt_provider
(&provider, ssl_server_trust_prompt, this, pool);
@@ -399,7 +399,7 @@ svn_auth_provider_object_t *Prompter::ge
svn_auth_provider_object_t *Prompter::getProviderClientSSL(SVN::Pool &in_pool)
{
- apr_pool_t *pool = in_pool.pool();
+ apr_pool_t *pool = in_pool.getPool();
svn_auth_provider_object_t *provider;
svn_auth_get_ssl_client_cert_prompt_provider(&provider,
ssl_client_cert_prompt,
@@ -412,7 +412,7 @@ svn_auth_provider_object_t *Prompter::ge
svn_auth_provider_object_t *Prompter::getProviderClientSSLPassword(SVN::Pool &in_pool)
{
- apr_pool_t *pool = in_pool.pool();
+ apr_pool_t *pool = in_pool.getPool();
svn_auth_provider_object_t *provider;
svn_auth_get_ssl_client_cert_pw_prompt_provider
(&provider, ssl_client_cert_pw_prompt, this, 2 /* retry limit */,
Modified: subversion/trunk/subversion/bindings/javahl/native/RevisionRange.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/RevisionRange.cpp?rev=1154155&r1=1154154&r2=1154155&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/RevisionRange.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/RevisionRange.cpp Fri Aug 5 10:12:00 2011
@@ -87,7 +87,7 @@ const svn_opt_revision_range_t *Revision
return NULL;
svn_opt_revision_range_t *range =
- (svn_opt_revision_range_t *) apr_palloc(pool.pool(), sizeof(*range));
+ (svn_opt_revision_range_t *) apr_palloc(pool.getPool(), sizeof(*range));
range->start = *startRevision.revision();
if (JNIUtil::isExceptionThrown())
Modified: subversion/trunk/subversion/bindings/javahl/native/RevpropTable.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/RevpropTable.cpp?rev=1154155&r1=1154154&r2=1154155&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/RevpropTable.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/RevpropTable.cpp Fri Aug 5 10:12:00 2011
@@ -46,15 +46,15 @@ const apr_hash_t *RevpropTable::hash(con
if (m_revprops.size() == 0)
return NULL;
- apr_hash_t *revprop_table = apr_hash_make(pool.pool());
+ apr_hash_t *revprop_table = apr_hash_make(pool.getPool());
std::map<std::string, std::string>::const_iterator it;
for (it = m_revprops.begin(); it != m_revprops.end(); ++it)
{
- const char *propname = apr_pstrdup(pool.pool(), it->first.c_str());
+ const char *propname = apr_pstrdup(pool.getPool(), it->first.c_str());
if (!svn_prop_name_is_valid(propname))
{
- const char *msg = apr_psprintf(pool.pool(),
+ const char *msg = apr_psprintf(pool.getPool(),
"Invalid property name: '%s'",
propname);
JNIUtil::throwNativeException(JAVA_PACKAGE "/ClientException", msg,
@@ -63,7 +63,7 @@ const apr_hash_t *RevpropTable::hash(con
}
svn_string_t *propval = svn_string_create(it->second.c_str(),
- pool.pool());
+ pool.getPool());
apr_hash_set(revprop_table, propname, APR_HASH_KEY_STRING, propval);
}
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=1154155&r1=1154154&r2=1154155&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Fri Aug 5 10:12:00 2011
@@ -96,7 +96,7 @@ jstring SVNClient::getAdminDirectoryName
{
SVN::Pool subPool(pool);
jstring name =
- JNIUtil::makeJString(svn_wc_get_adm_dir(subPool.pool()));
+ JNIUtil::makeJString(svn_wc_get_adm_dir(subPool.getPool()));
if (JNIUtil::isJavaExceptionThrown())
return NULL;
@@ -106,7 +106,7 @@ jstring SVNClient::getAdminDirectoryName
jboolean SVNClient::isAdminDirectory(const char *name)
{
SVN::Pool subPool(pool);
- return svn_wc_is_adm_dir(name, subPool.pool()) ? JNI_TRUE : JNI_FALSE;
+ return svn_wc_is_adm_dir(name, subPool.getPool()) ? JNI_TRUE : JNI_FALSE;
}
const char *SVNClient::getLastPath()
@@ -140,7 +140,7 @@ void SVNClient::list(const char *url, Re
fetchLocks,
ListCallback::callback,
callback,
- ctx, subPool.pool()), );
+ ctx, subPool.getPool()), );
}
void
@@ -172,7 +172,7 @@ SVNClient::status(const char *path, svn_
ignoreExternals,
changelists.array(subPool),
StatusCallback::callback, callback,
- subPool.pool()), );
+ subPool.getPool()), );
}
void SVNClient::logMessages(const char *path, Revision &pegRevision,
@@ -194,7 +194,7 @@ void SVNClient::logMessages(const char *
SVN_JNI_ERR(target.error_occured(), );
apr_array_header_t *ranges =
- apr_array_make(subPool.pool(), logRanges.size(),
+ apr_array_make(subPool.getPool(), logRanges.size(),
sizeof(svn_opt_revision_range_t *));
std::vector<RevisionRange>::const_iterator it;
@@ -206,7 +206,7 @@ void SVNClient::logMessages(const char *
== svn_opt_revision_unspecified)
{
svn_opt_revision_range_t *range =
- (svn_opt_revision_range_t *)apr_pcalloc(subPool.pool(),
+ (svn_opt_revision_range_t *)apr_pcalloc(subPool.getPool(),
sizeof(*range));
range->start.kind = svn_opt_revision_number;
range->start.value.number = 1;
@@ -227,7 +227,7 @@ void SVNClient::logMessages(const char *
includeMergedRevisions,
revProps.array(subPool),
LogMessageCallback::callback, callback, ctx,
- subPool.pool()), );
+ subPool.getPool()), );
}
jlong SVNClient::checkout(const char *moduleName, const char *destPath,
@@ -258,7 +258,7 @@ jlong SVNClient::checkout(const char *mo
ignoreExternals,
allowUnverObstructions,
ctx,
- subPool.pool()),
+ subPool.getPool()),
-1);
return rev;
@@ -279,7 +279,7 @@ void SVNClient::remove(Targets &targets,
SVN_JNI_ERR(svn_client_delete4(targets2, force, keep_local,
revprops.hash(subPool),
CommitCallback::callback, callback,
- ctx, subPool.pool()), );
+ ctx, subPool.getPool()), );
}
void SVNClient::revert(const char *path, svn_depth_t depth,
@@ -298,7 +298,7 @@ void SVNClient::revert(const char *path,
SVN_JNI_ERR(target.error_occured(), );
SVN_JNI_ERR(svn_client_revert2(targets, depth,
changelists.array(subPool), ctx,
- subPool.pool()), );
+ subPool.getPool()), );
}
void SVNClient::add(const char *path,
@@ -317,7 +317,7 @@ void SVNClient::add(const char *path,
SVN_JNI_ERR(svn_client_add4(intPath.c_str(), depth, force,
no_ignore, add_parents, ctx,
- subPool.pool()), );
+ subPool.getPool()), );
}
jlongArray SVNClient::update(Targets &targets, Revision &revision,
@@ -342,7 +342,7 @@ jlongArray SVNClient::update(Targets &ta
allowUnverObstructions,
TRUE /* adds_as_modification */,
makeParents,
- ctx, subPool.pool()),
+ ctx, subPool.getPool()),
NULL);
JNIEnv *env = JNIUtil::getEnv();
@@ -379,7 +379,7 @@ void SVNClient::commit(Targets &targets,
changelists.array(subPool),
revprops.hash(subPool),
CommitCallback::callback, callback,
- ctx, subPool.pool()),
+ ctx, subPool.getPool()),
);
}
@@ -409,7 +409,7 @@ void SVNClient::copy(CopySources ©So
copyAsChild, makeParents, ignoreExternals,
revprops.hash(subPool),
CommitCallback::callback, callback,
- ctx, subPool.pool()), );
+ ctx, subPool.getPool()), );
}
void SVNClient::move(Targets &srcPaths, const char *destPath,
@@ -433,7 +433,7 @@ void SVNClient::move(Targets &srcPaths,
destinationPath.c_str(), moveAsChild,
makeParents, revprops.hash(subPool),
CommitCallback::callback, callback, ctx,
- subPool.pool()), );
+ subPool.getPool()), );
}
void SVNClient::mkdir(Targets &targets, CommitMessage *message,
@@ -451,7 +451,7 @@ void SVNClient::mkdir(Targets &targets,
SVN_JNI_ERR(svn_client_mkdir4(targets2, makeParents,
revprops.hash(subPool),
CommitCallback::callback, callback,
- ctx, subPool.pool()), );
+ ctx, subPool.getPool()), );
}
void SVNClient::cleanup(const char *path)
@@ -465,7 +465,7 @@ void SVNClient::cleanup(const char *path
if (ctx == NULL)
return;
- SVN_JNI_ERR(svn_client_cleanup(intPath.c_str(), ctx, subPool.pool()),);
+ SVN_JNI_ERR(svn_client_cleanup(intPath.c_str(), ctx, subPool.getPool()),);
}
void SVNClient::resolve(const char *path, svn_depth_t depth,
@@ -480,7 +480,7 @@ void SVNClient::resolve(const char *path
return;
SVN_JNI_ERR(svn_client_resolve(intPath.c_str(), depth, choice,
- ctx, subPool.pool()), );
+ ctx, subPool.getPool()), );
}
jlong SVNClient::doExport(const char *srcPath, const char *destPath,
@@ -507,7 +507,7 @@ jlong SVNClient::doExport(const char *sr
ignoreExternals, FALSE,
depth,
nativeEOL, ctx,
- subPool.pool()),
+ subPool.getPool()),
-1);
return rev;
@@ -544,7 +544,7 @@ jlong SVNClient::doSwitch(const char *pa
allowUnverObstructions,
ignoreAncestry,
ctx,
- subPool.pool()),
+ subPool.getPool()),
-1);
return rev;
@@ -571,7 +571,7 @@ void SVNClient::doImport(const char *pat
noIgnore, ignoreUnknownNodeTypes,
revprops.hash(subPool),
CommitCallback::callback, callback,
- ctx, subPool.pool()), );
+ ctx, subPool.getPool()), );
}
jobject
@@ -585,7 +585,7 @@ SVNClient::suggestMergeSources(const cha
apr_array_header_t *sources;
SVN_JNI_ERR(svn_client_suggest_merge_sources(&sources, path,
pegRevision.revision(),
- ctx, subPool.pool()),
+ ctx, subPool.getPool()),
NULL);
return CreateJ::StringSet(sources);
@@ -618,7 +618,7 @@ void SVNClient::merge(const char *path1,
intLocalPath.c_str(),
depth,
ignoreAncestry, force, recordOnly, dryRun,
- TRUE, NULL, ctx, subPool.pool()), );
+ TRUE, NULL, ctx, subPool.getPool()), );
}
void SVNClient::merge(const char *path, Revision &pegRevision,
@@ -640,7 +640,7 @@ void SVNClient::merge(const char *path,
return;
apr_array_header_t *ranges =
- apr_array_make(subPool.pool(), rangesToMerge.size(),
+ apr_array_make(subPool.getPool(), rangesToMerge.size(),
sizeof(const svn_opt_revision_range_t *));
std::vector<RevisionRange>::const_iterator it;
@@ -652,7 +652,7 @@ void SVNClient::merge(const char *path,
== svn_opt_revision_unspecified)
{
svn_opt_revision_range_t *range =
- (svn_opt_revision_range_t *)apr_pcalloc(subPool.pool(),
+ (svn_opt_revision_range_t *)apr_pcalloc(subPool.getPool(),
sizeof(*range));
range->start.kind = svn_opt_revision_number;
range->start.value.number = 1;
@@ -675,7 +675,7 @@ void SVNClient::merge(const char *path,
depth,
ignoreAncestry, force, recordOnly,
dryRun, TRUE, NULL, ctx,
- subPool.pool()), );
+ subPool.getPool()), );
}
void SVNClient::mergeReintegrate(const char *path, Revision &pegRevision,
@@ -698,7 +698,7 @@ void SVNClient::mergeReintegrate(const c
pegRevision.revision(),
intLocalPath.c_str(),
dryRun, NULL, ctx,
- subPool.pool()), );
+ subPool.getPool()), );
}
jobject
@@ -717,7 +717,7 @@ SVNClient::getMergeinfo(const char *targ
SVN_JNI_ERR(svn_client_mergeinfo_get_merged(&mergeinfo,
intLocalTarget.c_str(),
pegRevision.revision(), ctx,
- subPool.pool()),
+ subPool.getPool()),
NULL);
if (mergeinfo == NULL)
return NULL;
@@ -750,7 +750,7 @@ SVNClient::getMergeinfo(const char *targ
return NULL;
apr_hash_index_t *hi;
- for (hi = apr_hash_first(subPool.pool(), mergeinfo);
+ for (hi = apr_hash_first(subPool.getPool(), mergeinfo);
hi;
hi = apr_hash_next(hi))
{
@@ -807,7 +807,7 @@ void SVNClient::getMergeinfoLog(int type
depth,
revProps.array(subPool),
ctx,
- subPool.pool()), );
+ subPool.getPool()), );
return;
}
@@ -832,12 +832,12 @@ jbyteArray SVNClient::propertyGet(const
SVN_JNI_ERR(svn_client_propget3(&props, name,
intPath.c_str(), pegRevision.revision(),
revision.revision(), NULL, svn_depth_empty,
- NULL, ctx, subPool.pool()),
+ NULL, ctx, subPool.getPool()),
NULL);
apr_hash_index_t *hi;
// only one element since we disabled recurse
- hi = apr_hash_first(subPool.pool(), props);
+ hi = apr_hash_first(subPool.getPool(), props);
if (hi == NULL)
return NULL; // no property with this name
@@ -868,7 +868,7 @@ void SVNClient::properties(const char *p
revision.revision(), depth,
changelists.array(subPool),
ProplistCallback::callback, callback,
- ctx, subPool.pool()), );
+ ctx, subPool.getPool()), );
return;
}
@@ -885,7 +885,7 @@ void SVNClient::propertySetLocal(Targets
val = NULL;
else
val = svn_string_ncreate((const char *)value.getBytes(), value.getLength(),
- subPool.pool());
+ subPool.getPool());
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
if (ctx == NULL)
@@ -895,7 +895,7 @@ void SVNClient::propertySetLocal(Targets
SVN_JNI_ERR(svn_client_propset_local(name, val, targetsApr,
depth, force,
changelists.array(subPool),
- ctx, subPool.pool()), );
+ ctx, subPool.getPool()), );
}
void SVNClient::propertySetRemote(const char *path, const char *name,
@@ -911,7 +911,7 @@ void SVNClient::propertySetRemote(const
val = NULL;
else
val = svn_string_ncreate((const char *)value.getBytes(), value.getLength(),
- subPool.pool());
+ subPool.getPool());
Path intPath(path, subPool);
SVN_JNI_ERR(intPath.error_occured(), );
@@ -924,7 +924,7 @@ void SVNClient::propertySetRemote(const
force, SVN_INVALID_REVNUM,
revprops.hash(subPool),
CommitCallback::callback, callback,
- ctx, subPool.pool()), );
+ ctx, subPool.getPool()), );
}
void SVNClient::diff(const char *target1, Revision &revision1,
@@ -938,7 +938,7 @@ void SVNClient::diff(const char *target1
svn_error_t *err;
SVN::Pool subPool(pool);
const char *c_relToDir = relativeToDir ?
- svn_dirent_canonicalize(relativeToDir, subPool.pool()) :
+ svn_dirent_canonicalize(relativeToDir, subPool.getPool()) :
relativeToDir;
SVN_JNI_NULL_PTR_EX(target1, "target", );
@@ -958,9 +958,9 @@ void SVNClient::diff(const char *target1
apr_status_t rv =
apr_file_open(&outfile,
svn_dirent_internal_style(outfileName,
- subPool.pool()),
+ subPool.getPool()),
APR_CREATE|APR_WRITE|APR_TRUNCATE , APR_OS_DEFAULT,
- subPool.pool());
+ subPool.getPool());
if (rv != APR_SUCCESS)
{
SVN_JNI_ERR(svn_error_createf(rv, NULL, _("Cannot open file '%s'"),
@@ -968,7 +968,7 @@ void SVNClient::diff(const char *target1
}
// We don't use any options to diff.
- apr_array_header_t *diffOptions = apr_array_make(subPool.pool(),
+ apr_array_header_t *diffOptions = apr_array_make(subPool.getPool(),
0, sizeof(char *));
if (pegRevision)
@@ -990,7 +990,7 @@ void SVNClient::diff(const char *target1
NULL /* error file */,
changelists.array(subPool),
ctx,
- subPool.pool());
+ subPool.getPool());
}
else
{
@@ -1022,7 +1022,7 @@ void SVNClient::diff(const char *target1
NULL /* error file */,
changelists.array(subPool),
ctx,
- subPool.pool());
+ subPool.getPool());
}
cleanup:
@@ -1090,7 +1090,7 @@ SVNClient::diffSummarize(const char *tar
changelists.array(subPool),
DiffSummaryReceiver::summarize,
&receiver,
- ctx, subPool.pool()), );
+ ctx, subPool.getPool()), );
}
void
@@ -1119,7 +1119,7 @@ SVNClient::diffSummarize(const char *tar
changelists.array(subPool),
DiffSummaryReceiver::summarize,
&receiver, ctx,
- subPool.pool()), );
+ subPool.getPool()), );
}
void SVNClient::streamFileContent(const char *path, Revision &revision,
@@ -1137,7 +1137,7 @@ void SVNClient::streamFileContent(const
SVN_JNI_ERR(svn_client_cat2(outputStream.getStream(subPool),
path, pegRevision.revision(),
- revision.revision(), ctx, subPool.pool()),
+ revision.revision(), ctx, subPool.getPool()),
);
}
@@ -1158,8 +1158,8 @@ jbyteArray SVNClient::revProperty(const
svn_string_t *propval;
svn_revnum_t set_rev;
SVN_JNI_ERR(svn_client_url_from_path2(&URL, intPath.c_str(), ctx,
- subPool.pool(),
- subPool.pool()),
+ subPool.getPool(),
+ subPool.getPool()),
NULL);
if (URL == NULL)
@@ -1171,7 +1171,7 @@ jbyteArray SVNClient::revProperty(const
SVN_JNI_ERR(svn_client_revprop_get(name, &propval, URL,
rev.revision(), &set_rev, ctx,
- subPool.pool()),
+ subPool.getPool()),
NULL);
if (propval == NULL)
return NULL;
@@ -1201,7 +1201,7 @@ void SVNClient::relocate(const char *fro
SVN_JNI_ERR(svn_client_relocate2(intPath.c_str(), intFrom.c_str(),
intTo.c_str(), ignoreExternals, ctx,
- subPool.pool()), );
+ subPool.getPool()), );
}
void SVNClient::blame(const char *path, Revision &pegRevision,
@@ -1211,7 +1211,7 @@ void SVNClient::blame(const char *path,
{
SVN::Pool subPool(pool);
SVN_JNI_NULL_PTR_EX(path, "path", );
- apr_pool_t *pool = subPool.pool();
+ apr_pool_t *pool = subPool.getPool();
Path intPath(path, subPool);
SVN_JNI_ERR(intPath.error_occured(), );
@@ -1240,7 +1240,7 @@ void SVNClient::addToChangelist(Targets
SVN_JNI_ERR(svn_client_add_to_changelist(srcs, changelist, depth,
changelists.array(subPool),
- ctx, subPool.pool()), );
+ ctx, subPool.getPool()), );
}
void SVNClient::removeFromChangelists(Targets &srcPaths, svn_depth_t depth,
@@ -1254,7 +1254,7 @@ void SVNClient::removeFromChangelists(Ta
SVN_JNI_ERR(svn_client_remove_from_changelists(srcs, depth,
changelists.array(subPool),
- ctx, subPool.pool()), );
+ ctx, subPool.getPool()), );
}
void SVNClient::getChangelists(const char *rootPath,
@@ -1268,7 +1268,7 @@ void SVNClient::getChangelists(const cha
SVN_JNI_ERR(svn_client_get_changelists(rootPath,
changelists.array(subPool),
depth, ChangelistCallback::callback,
- callback, ctx, subPool.pool()),
+ callback, ctx, subPool.getPool()),
);
}
@@ -1280,7 +1280,7 @@ void SVNClient::lock(Targets &targets, c
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
SVN_JNI_ERR(svn_client_lock(targetsApr, comment, force, ctx,
- subPool.pool()), );
+ subPool.getPool()), );
}
void SVNClient::unlock(Targets &targets, bool force)
@@ -1291,7 +1291,7 @@ void SVNClient::unlock(Targets &targets,
SVN_JNI_ERR(targets.error_occured(), );
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
SVN_JNI_ERR(svn_client_unlock((apr_array_header_t*)targetsApr, force,
- ctx, subPool.pool()), );
+ ctx, subPool.getPool()), );
}
void SVNClient::setRevProperty(const char *path,
const char *name, Revision &rev,
@@ -1310,8 +1310,8 @@ void SVNClient::setRevProperty(const cha
const char *URL;
SVN_JNI_ERR(svn_client_url_from_path2(&URL, intPath.c_str(), ctx,
- subPool.pool(),
- subPool.pool()), );
+ subPool.getPool(),
+ subPool.getPool()), );
if (URL == NULL)
{
@@ -1320,17 +1320,17 @@ void SVNClient::setRevProperty(const cha
);
}
- svn_string_t *val = svn_string_create(value, subPool.pool());
+ svn_string_t *val = svn_string_create(value, subPool.getPool());
svn_string_t *orig_val;
if (original_value != NULL)
- orig_val = svn_string_create(original_value, subPool.pool());
+ orig_val = svn_string_create(original_value, subPool.getPool());
else
orig_val = NULL;
svn_revnum_t set_revision;
SVN_JNI_ERR(svn_client_revprop_set2(name, val, orig_val, URL, rev.revision(),
&set_revision, force, ctx,
- subPool.pool()), );
+ subPool.getPool()), );
}
jstring SVNClient::getVersionInfo(const char *path, const char *trailUrl,
@@ -1347,14 +1347,14 @@ jstring SVNClient::getVersionInfo(const
if (ctx == NULL)
return NULL;
SVN_JNI_ERR(svn_wc_check_wc2(&wc_format, ctx->wc_ctx, intPath.c_str(),
- subPool.pool()),
+ subPool.getPool()),
NULL);
if (! wc_format)
{
svn_node_kind_t kind;
SVN_JNI_ERR(svn_io_check_path(intPath.c_str(), &kind,
- subPool.pool()),
+ subPool.getPool()),
NULL);
if (kind == svn_node_dir)
{
@@ -1373,12 +1373,12 @@ jstring SVNClient::getVersionInfo(const
const char *local_abspath;
SVN_JNI_ERR(svn_dirent_get_absolute(&local_abspath, intPath.c_str(),
- subPool.pool()), NULL);
+ subPool.getPool()), NULL);
SVN_JNI_ERR(svn_wc_revision_status2(&result, ctx->wc_ctx, local_abspath,
trailUrl, lastChanged,
ctx->cancel_func, ctx->cancel_baton,
- subPool.pool(),
- subPool.pool()), NULL);
+ subPool.getPool(),
+ subPool.getPool()), NULL);
std::ostringstream value;
value << result->min_rev;
@@ -1409,7 +1409,7 @@ void SVNClient::upgrade(const char *path
Path checkedPath(path, subPool);
SVN_JNI_ERR(checkedPath.error_occured(), );
- SVN_JNI_ERR(svn_client_upgrade(path, ctx, subPool.pool()), );
+ SVN_JNI_ERR(svn_client_upgrade(path, ctx, subPool.getPool()), );
}
jobject SVNClient::revProperties(const char *path, Revision &revision)
@@ -1424,15 +1424,15 @@ jobject SVNClient::revProperties(const c
const char *URL;
svn_revnum_t set_rev;
SVN_JNI_ERR(svn_client_url_from_path2(&URL, intPath.c_str(), ctx,
- subPool.pool(),
- subPool.pool()),
+ subPool.getPool(),
+ subPool.getPool()),
NULL);
if (ctx == NULL)
return NULL;
SVN_JNI_ERR(svn_client_revprop_list(&props, URL, revision.revision(),
- &set_rev, ctx, subPool.pool()),
+ &set_rev, ctx, subPool.getPool()),
NULL);
return CreateJ::PropertyMap(props);
@@ -1465,7 +1465,7 @@ SVNClient::info2(const char *path, Revis
depth, FALSE, TRUE,
changelists.array(subPool),
InfoCallback::callback, callback,
- ctx, subPool.pool()), );
+ ctx, subPool.getPool()), );
}
void
@@ -1492,7 +1492,7 @@ SVNClient::patch(const char *patchPath,
dryRun, stripCount, reverse,
ignoreWhitespace, removeTempfiles,
PatchCallback::callback, callback,
- ctx, subPool.pool()), );
+ ctx, subPool.getPool()), );
}
ClientContext &
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNRepos.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNRepos.cpp?rev=1154155&r1=1154154&r2=1154155&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNRepos.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNRepos.cpp Fri Aug 5 10:12:00 2011
@@ -83,7 +83,7 @@ void SVNRepos::create(File &path, bool d
SVN::Pool requestPool;
svn_repos_t *repos;
apr_hash_t *config;
- apr_hash_t *fs_config = apr_hash_make(requestPool.pool());
+ apr_hash_t *fs_config = apr_hash_make(requestPool.getPool());
if (path.isNull())
{
@@ -103,10 +103,10 @@ void SVNRepos::create(File &path, bool d
SVN_JNI_ERR(svn_config_get_config(&config,
configPath.getInternalStyle(requestPool),
- requestPool.pool()),);
+ requestPool.getPool()),);
SVN_JNI_ERR(svn_repos_create(&repos, path.getInternalStyle(requestPool),
NULL, NULL, config, fs_config,
- requestPool.pool()), );
+ requestPool.getPool()), );
}
void SVNRepos::deltify(File &path, Revision &revStart, Revision &revEnd)
@@ -125,9 +125,9 @@ void SVNRepos::deltify(File &path, Revis
}
SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
- NULL, requestPool.pool()), );
+ NULL, requestPool.getPool()), );
fs = svn_repos_fs(repos);
- SVN_JNI_ERR(svn_fs_youngest_rev(&youngest, fs, requestPool.pool()), );
+ SVN_JNI_ERR(svn_fs_youngest_rev(&youngest, fs, requestPool.getPool()), );
if (revStart.revision()->kind == svn_opt_revision_number)
/* ### We only handle revision numbers right now, not dates. */
@@ -169,7 +169,7 @@ void SVNRepos::deltify(File &path, Revis
for (revision = start; revision <= end; ++revision)
{
revisionPool.clear();
- SVN_JNI_ERR(svn_fs_deltify_revision (fs, revision, revisionPool.pool()),
+ SVN_JNI_ERR(svn_fs_deltify_revision (fs, revision, revisionPool.getPool()),
);
}
@@ -194,9 +194,9 @@ void SVNRepos::dump(File &path, OutputSt
}
SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
- NULL, requestPool.pool()), );
+ NULL, requestPool.getPool()), );
fs = svn_repos_fs(repos);
- SVN_JNI_ERR(svn_fs_youngest_rev(&youngest, fs, requestPool.pool()), );
+ SVN_JNI_ERR(svn_fs_youngest_rev(&youngest, fs, requestPool.getPool()), );
/* ### We only handle revision numbers right now, not dates. */
if (revsionStart.revision()->kind == svn_opt_revision_number)
@@ -244,7 +244,7 @@ void SVNRepos::dump(File &path, OutputSt
? ReposNotifyCallback::notify
: NULL,
notifyCallback,
- checkCancel, this, requestPool.pool()), );
+ checkCancel, this, requestPool.getPool()), );
}
void SVNRepos::hotcopy(File &path, File &targetPath,
@@ -266,7 +266,7 @@ void SVNRepos::hotcopy(File &path, File
SVN_JNI_ERR(svn_repos_hotcopy(path.getInternalStyle(requestPool),
targetPath.getInternalStyle(requestPool),
- cleanLogs, requestPool.pool()), );
+ cleanLogs, requestPool.getPool()), );
}
static void
@@ -283,7 +283,7 @@ list_dblogs (File &path, MessageReceiver
SVN_JNI_ERR(svn_repos_db_logfiles(&logfiles,
path.getInternalStyle(requestPool),
- only_unused, requestPool.pool()), );
+ only_unused, requestPool.getPool()), );
/* Loop, printing log files. We append the log paths to the
* repository path, making sure to return everything to the native
@@ -293,8 +293,8 @@ list_dblogs (File &path, MessageReceiver
const char *log_utf8;
log_utf8 = svn_dirent_join(path.getInternalStyle(requestPool),
APR_ARRAY_IDX(logfiles, i, const char *),
- requestPool.pool());
- log_utf8 = svn_dirent_local_style (log_utf8, requestPool.pool());
+ requestPool.getPool());
+ log_utf8 = svn_dirent_local_style (log_utf8, requestPool.getPool());
receiver.receiveMessage(log_utf8);
}
}
@@ -334,7 +334,7 @@ void SVNRepos::load(File &path,
}
SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
- NULL, requestPool.pool()), );
+ NULL, requestPool.getPool()), );
SVN_JNI_ERR(svn_repos_load_fs3(repos, dataIn.getStream(requestPool),
uuid_action, relativePath,
@@ -344,7 +344,7 @@ void SVNRepos::load(File &path,
? ReposNotifyCallback::notify
: NULL,
notifyCallback,
- checkCancel, this, requestPool.pool()), );
+ checkCancel, this, requestPool.getPool()), );
}
void SVNRepos::lstxns(File &path, MessageReceiver &messageReceiver)
@@ -361,9 +361,9 @@ void SVNRepos::lstxns(File &path, Messag
}
SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
- NULL, requestPool.pool()), );
+ NULL, requestPool.getPool()), );
fs = svn_repos_fs (repos);
- SVN_JNI_ERR(svn_fs_list_transactions(&txns, fs, requestPool.pool()), );
+ SVN_JNI_ERR(svn_fs_list_transactions(&txns, fs, requestPool.getPool()), );
/* Loop, printing revisions. */
for (int i = 0; i < txns->nelts; ++i)
@@ -391,16 +391,16 @@ jlong SVNRepos::recover(File &path, Repo
? ReposNotifyCallback::notify
: NULL,
notifyCallback,
- checkCancel, this, requestPool.pool()),
+ checkCancel, this, requestPool.getPool()),
-1);
/* Since db transactions may have been replayed, it's nice to tell
* people what the latest revision is. It also proves that the
* recovery actually worked. */
SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
- NULL, requestPool.pool()), -1);
+ NULL, requestPool.getPool()), -1);
SVN_JNI_ERR(svn_fs_youngest_rev(&youngest_rev, svn_repos_fs (repos),
- requestPool.pool()),
+ requestPool.getPool()),
-1);
return youngest_rev;
}
@@ -422,7 +422,7 @@ void SVNRepos::rmtxns(File &path, String
}
SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
- NULL, requestPool.pool()), );
+ NULL, requestPool.getPool()), );
fs = svn_repos_fs (repos);
args = transactions.array(requestPool);
@@ -433,9 +433,9 @@ void SVNRepos::rmtxns(File &path, String
svn_error_t *err;
/* Try to open the txn. If that succeeds, try to abort it. */
- err = svn_fs_open_txn(&txn, fs, txn_name, transactionPool.pool());
+ err = svn_fs_open_txn(&txn, fs, txn_name, transactionPool.getPool());
if (! err)
- err = svn_fs_abort_txn(txn, transactionPool.pool());
+ err = svn_fs_abort_txn(txn, transactionPool.getPool());
/* If either the open or the abort of the txn fails because that
* transaction is dead, just try to purge the thing. Else,
@@ -444,7 +444,7 @@ void SVNRepos::rmtxns(File &path, String
if (err && (err->apr_err == SVN_ERR_FS_TRANSACTION_DEAD))
{
svn_error_clear (err);
- err = svn_fs_purge_txn(fs, txn_name, transactionPool.pool());
+ err = svn_fs_purge_txn(fs, txn_name, transactionPool.getPool());
}
/* If we had a real from the txn open, abort, or purge, we clear
@@ -479,13 +479,13 @@ void SVNRepos::setRevProp(File &path, Re
/* Open the filesystem. */
svn_repos_t *repos;
SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
- NULL, requestPool.pool()), );
+ NULL, requestPool.getPool()), );
/* If we are bypassing the hooks system, we just hit the filesystem
* directly. */
svn_error_t *err;
svn_string_t *propValStr = svn_string_create(propValue,
- requestPool.pool());
+ requestPool.getPool());
if (usePreRevPropChangeHook || usePostRevPropChangeHook)
{
err = svn_repos_fs_change_rev_prop4(repos,
@@ -493,14 +493,14 @@ void SVNRepos::setRevProp(File &path, Re
NULL, propName, NULL, propValStr,
usePreRevPropChangeHook,
usePostRevPropChangeHook, NULL,
- NULL, requestPool.pool());
+ NULL, requestPool.getPool());
}
else
{
svn_fs_t *fs = svn_repos_fs (repos);
err = svn_fs_change_rev_prop2(fs, revision.revision()->value.number,
propName, NULL, propValStr,
- requestPool.pool());
+ requestPool.getPool());
}
SVN_JNI_ERR(err, );
}
@@ -553,15 +553,15 @@ SVNRepos::verify(File &path, Revision &r
/* This whole process is basically just a dump of the repository
* with no interest in the output. */
SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
- NULL, requestPool.pool()), );
+ NULL, requestPool.getPool()), );
SVN_JNI_ERR(svn_fs_youngest_rev(&youngest, svn_repos_fs (repos),
- requestPool.pool()), );
+ requestPool.getPool()), );
/* Find the revision numbers at which to start and end. */
SVN_JNI_ERR(getRevnum(&lower, revisionStart.revision(),
- youngest, repos, requestPool.pool()), );
+ youngest, repos, requestPool.getPool()), );
SVN_JNI_ERR(getRevnum(&upper, revisionEnd.revision(),
- youngest, repos, requestPool.pool()), );
+ youngest, repos, requestPool.getPool()), );
// Fill in implied revisions if necessary.
if (lower == SVN_INVALID_REVNUM)
@@ -585,7 +585,7 @@ SVNRepos::verify(File &path, Revision &r
: NULL,
notifyCallback,
checkCancel, this /* cancel callback/baton */,
- requestPool.pool()), );
+ requestPool.getPool()), );
}
void SVNRepos::pack(File &path, ReposNotifyCallback *notifyCallback)
@@ -600,7 +600,7 @@ void SVNRepos::pack(File &path, ReposNot
}
SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
- NULL, requestPool.pool()), );
+ NULL, requestPool.getPool()), );
SVN_JNI_ERR(svn_repos_fs_pack2(repos,
notifyCallback != NULL
@@ -608,7 +608,7 @@ void SVNRepos::pack(File &path, ReposNot
: NULL,
notifyCallback,
checkCancel, this,
- requestPool.pool()),
+ requestPool.getPool()),
);
}
@@ -627,7 +627,7 @@ void SVNRepos::upgrade(File &path, Repos
? ReposNotifyCallback::notify
: NULL,
notifyCallback,
- requestPool.pool()),
+ requestPool.getPool()),
);
}
@@ -645,10 +645,10 @@ jobject SVNRepos::lslocks(File &path, sv
}
SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
- NULL, requestPool.pool()), NULL);
+ NULL, requestPool.getPool()), NULL);
/* Fetch all locks on or below the root directory. */
SVN_JNI_ERR(svn_repos_fs_get_locks2(&locks, repos, "/", depth, NULL, NULL,
- requestPool.pool()),
+ requestPool.getPool()),
NULL);
JNIEnv *env = JNIUtil::getEnv();
@@ -658,7 +658,7 @@ jobject SVNRepos::lslocks(File &path, sv
std::vector<jobject> jlocks;
- for (hi = apr_hash_first (requestPool.pool(), locks);
+ for (hi = apr_hash_first (requestPool.getPool(), locks);
hi;
hi = apr_hash_next (hi))
{
@@ -678,7 +678,7 @@ jobject SVNRepos::lslocks(File &path, sv
void SVNRepos::rmlocks(File &path, StringArray &locks)
{
SVN::Pool requestPool;
- apr_pool_t *pool = requestPool.pool();
+ apr_pool_t *pool = requestPool.getPool();
svn_repos_t *repos;
svn_fs_t *fs;
svn_fs_access_t *access;
@@ -690,7 +690,7 @@ void SVNRepos::rmlocks(File &path, Strin
}
SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
- NULL, requestPool.pool()), );
+ NULL, requestPool.getPool()), );
fs = svn_repos_fs (repos);
const char *username;
@@ -724,7 +724,7 @@ void SVNRepos::rmlocks(File &path, Strin
svn_lock_t *lock;
/* Fetch the path's svn_lock_t. */
- svn_error_t *err = svn_fs_get_lock(&lock, fs, lock_path, subpool.pool());
+ svn_error_t *err = svn_fs_get_lock(&lock, fs, lock_path, subpool.getPool());
if (err)
goto move_on;
if (! lock)
@@ -732,7 +732,7 @@ void SVNRepos::rmlocks(File &path, Strin
/* Now forcibly destroy the lock. */
err = svn_fs_unlock (fs, lock_path,
- lock->token, 1 /* force */, subpool.pool());
+ lock->token, 1 /* force */, subpool.getPool());
if (err)
goto move_on;
Modified: subversion/trunk/subversion/bindings/javahl/native/StringArray.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/StringArray.cpp?rev=1154155&r1=1154154&r2=1154155&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/StringArray.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/StringArray.cpp Fri Aug 5 10:12:00 2011
@@ -39,7 +39,7 @@ StringArray::~StringArray()
const apr_array_header_t *StringArray::array(const SVN::Pool &pool)
{
apr_array_header_t *strings
- = apr_array_make(pool.pool(), m_strings.size(), sizeof(char *));
+ = apr_array_make(pool.getPool(), m_strings.size(), sizeof(char *));
std::vector<std::string>::const_iterator it;
for (it = m_strings.begin(); it < m_strings.end(); ++it)
Modified: subversion/trunk/subversion/bindings/javahl/native/Targets.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/Targets.cpp?rev=1154155&r1=1154154&r2=1154155&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/Targets.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/Targets.cpp Fri Aug 5 10:12:00 2011
@@ -40,7 +40,7 @@ Targets::Targets(const char *path, SVN::
: m_subpool(in_pool)
{
m_strArray = NULL;
- m_targets.push_back (apr_pstrdup(m_subpool.pool(), path));
+ m_targets.push_back (apr_pstrdup(m_subpool.getPool(), path));
m_error_occured = NULL;
}
@@ -59,7 +59,7 @@ const apr_array_header_t *Targets::array
for (it = vec.begin(); it < vec.end(); ++it)
{
const char *tt = it->c_str();
- svn_error_t *err = JNIUtil::preprocessPath(tt, pool.pool());
+ svn_error_t *err = JNIUtil::preprocessPath(tt, pool.getPool());
if (err != NULL)
{
m_error_occured = err;
@@ -71,7 +71,7 @@ const apr_array_header_t *Targets::array
std::vector<const char*>::const_iterator it;
- apr_pool_t *apr_pool = pool.pool ();
+ apr_pool_t *apr_pool = pool.getPool();
apr_array_header_t *apr_targets = apr_array_make (apr_pool,
m_targets.size(),
sizeof(const char *));
@@ -80,7 +80,7 @@ const apr_array_header_t *Targets::array
{
const char *target = *it;
- svn_error_t *err = JNIUtil::preprocessPath(target, pool.pool());
+ svn_error_t *err = JNIUtil::preprocessPath(target, pool.getPool());
if (err != NULL)
{
m_error_occured = err;
Modified: subversion/trunk/subversion/bindings/javahl/native/libsvnjavahl.la.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/libsvnjavahl.la.c?rev=1154155&r1=1154154&r2=1154155&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/libsvnjavahl.la.c (original)
+++ subversion/trunk/subversion/bindings/javahl/native/libsvnjavahl.la.c Fri Aug 5 10:12:00 2011
@@ -30,3 +30,8 @@ JNI_OnLoad(JavaVM *vm, void *reserved)
{
return JNI_VERSION_1_2;
}
+
+JNIEXPORT void JNICALL
+JNI_OnUnload(JavaVM *vm, void *reserved)
+{
+}
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java?rev=1154155&r1=1154154&r2=1154155&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java Fri Aug 5 10:12:00 2011
@@ -131,10 +131,10 @@ public class NativeResources
{
initNativeLibrary();
version = new Version();
- if (!version.isAtLeast(1, 5, 0))
+ if (!version.isAtLeast(1, 7, 0))
{
throw new LinkageError("Native library version must be at least " +
- "1.5.0, but is only " + version);
+ "1.7.0, but is only " + version);
}
}