Author: vmpn
Date: Thu Dec 27 02:55:12 2012
New Revision: 1426106
URL: http://svn.apache.org/viewvc?rev=1426106&view=rev
Log:
On the javahl-ra branch:
Bring up-to-date with JavaHL changes on trunk@1405969
Modified:
subversion/branches/javahl-ra/ (props changed)
subversion/branches/javahl-ra/subversion/bindings/javahl/native/CopySources.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/CreateJ.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/InputStream.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/JNIThreadData.h
subversion/branches/javahl-ra/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/JNIUtil.h
subversion/branches/javahl-ra/subversion/bindings/javahl/native/OutputStream.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/RevisionRange.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp
Propchange: subversion/branches/javahl-ra/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1405872-1405969
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/native/CopySources.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/CopySources.cpp?rev=1426106&r1=1426105&r2=1426106&view=diff
==============================================================================
---
subversion/branches/javahl-ra/subversion/bindings/javahl/native/CopySources.cpp
(original)
+++
subversion/branches/javahl-ra/subversion/bindings/javahl/native/CopySources.cpp
Thu Dec 27 02:55:12 2012
@@ -143,10 +143,7 @@ CopySources::array(SVN::Pool &pool)
// TODO: Default this to svn_opt_revision_undefined (or HEAD)
Revision rev(jrev);
src->revision = reinterpret_cast<const svn_opt_revision_t *>
- (apr_palloc(p, sizeof(*src->revision)));
- memcpy(const_cast<svn_opt_revision_t *>(src->revision),
- rev.revision(),
- sizeof(*src->revision));
+ (apr_pmemdup(p, rev.revision(), sizeof(*src->revision)));
env->DeleteLocalRef(jrev);
// Extract pegRevision from the copy source.
@@ -164,10 +161,7 @@ CopySources::array(SVN::Pool &pool)
Revision pegRev(jPegRev, true);
src->peg_revision = reinterpret_cast<const svn_opt_revision_t *>
- (apr_palloc(p, sizeof(*src->peg_revision)));
- memcpy(const_cast<svn_opt_revision_t *>(src->peg_revision),
- pegRev.revision(),
- sizeof(*src->peg_revision));
+ (apr_pmemdup(p, pegRev.revision(), sizeof(*src->peg_revision)));
env->DeleteLocalRef(jPegRev);
APR_ARRAY_PUSH(copySources, svn_client_copy_source_t *) = src;
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/native/CreateJ.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/CreateJ.cpp?rev=1426106&r1=1426105&r2=1426106&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/CreateJ.cpp
(original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/CreateJ.cpp
Thu Dec 27 02:55:12 2012
@@ -20,8 +20,8 @@
* ====================================================================
* @endcopyright
*
- * @file ConflictResolverCallback.cpp
- * @brief Implementation of the class ConflictResolverCallback.
+ * @file CreateJ.cpp
+ * @brief Implementation of the class CreateJ.
*/
#include "svn_error.h"
@@ -207,9 +207,8 @@ CreateJ::Checksum(const svn_checksum_t *
}
jbyteArray jdigest
- = JNIUtil::makeJByteArray(
- reinterpret_cast<const signed char *>(checksum->digest),
- static_cast<int>(svn_checksum_size(checksum)));
+ = JNIUtil::makeJByteArray(checksum->digest,
+ static_cast<int>(svn_checksum_size(checksum)));
if (JNIUtil::isExceptionThrown())
POP_AND_RETURN_NULL;
@@ -1086,9 +1085,8 @@ jobject CreateJ::PropertyMap(apr_hash_t
POP_AND_RETURN_NULL;
apr_hash_index_t *hi;
- int i = 0;
for (hi = apr_hash_first(apr_hash_pool_get(prop_hash), prop_hash);
- hi; hi = apr_hash_next(hi), ++i)
+ hi; hi = apr_hash_next(hi))
{
const char *key;
svn_string_t *val;
@@ -1102,9 +1100,7 @@ jobject CreateJ::PropertyMap(apr_hash_t
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
- jbyteArray jpropVal = JNIUtil::makeJByteArray(
- reinterpret_cast<const signed char *>(val->data),
- static_cast<int>(val->len));
+ jbyteArray jpropVal = JNIUtil::makeJByteArray(val);
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/native/InputStream.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/InputStream.cpp?rev=1426106&r1=1426105&r2=1426106&view=diff
==============================================================================
---
subversion/branches/javahl-ra/subversion/bindings/javahl/native/InputStream.cpp
(original)
+++
subversion/branches/javahl-ra/subversion/bindings/javahl/native/InputStream.cpp
Thu Dec 27 02:55:12 2012
@@ -89,9 +89,7 @@ svn_error_t *InputStream::read(void *bat
}
// Allocate a Java byte array to read the data.
- jbyteArray data = JNIUtil::makeJByteArray
- (reinterpret_cast<const signed char*>(buffer),
- static_cast<int>(*len));
+ jbyteArray data = JNIUtil::makeJByteArray(buffer, static_cast<int>(*len));
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/native/JNIThreadData.h
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/JNIThreadData.h?rev=1426106&r1=1426105&r2=1426106&view=diff
==============================================================================
---
subversion/branches/javahl-ra/subversion/bindings/javahl/native/JNIThreadData.h
(original)
+++
subversion/branches/javahl-ra/subversion/bindings/javahl/native/JNIThreadData.h
Thu Dec 27 02:55:12 2012
@@ -21,7 +21,7 @@
* @endcopyright
*
* @file JNIThreadData.h
- * @brief Interface of the class JNIData
+ * @brief Interface of the class JNIThreadData
*/
#ifndef JNITHREADDATA_H
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/native/JNIUtil.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/JNIUtil.cpp?rev=1426106&r1=1426105&r2=1426106&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/JNIUtil.cpp
(original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/JNIUtil.cpp
Thu Dec 27 02:55:12 2012
@@ -395,7 +395,7 @@ JNIUtil::putErrorsInTrace(svn_error_t *e
return;
char *tmp_path;
- char *path = svn_relpath_dirname(err->file, err->pool);
+ char *path = svn_dirent_dirname(err->file, err->pool);
while (tmp_path = strchr(path, '/'))
*tmp_path = '.';
@@ -403,7 +403,7 @@ JNIUtil::putErrorsInTrace(svn_error_t *e
if (isJavaExceptionThrown())
return;
- jstring jfileName = makeJString(svn_relpath_basename(err->file, err->pool));
+ jstring jfileName = makeJString(svn_dirent_basename(err->file, err->pool));
if (isJavaExceptionThrown())
return;
@@ -820,7 +820,7 @@ JNIUtil::getDate(jobject jdate)
* @param data the character array
* @param length the number of characters in the array
*/
-jbyteArray JNIUtil::makeJByteArray(const signed char *data, int length)
+jbyteArray JNIUtil::makeJByteArray(const void *data, int length)
{
if (data == NULL)
{
@@ -852,6 +852,15 @@ jbyteArray JNIUtil::makeJByteArray(const
}
/**
+ * Create a Java byte array from an svn_string_t.
+ * @param str the string
+ */
+jbyteArray JNIUtil::makeJByteArray(const svn_string_t *str)
+{
+ return JNIUtil::makeJByteArray(str->data, static_cast<int>(str->len));
+}
+
+/**
* Build the error message from the svn error into buffer. This
* method calls itselft recursively for all the chained errors
*
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/native/JNIUtil.h
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/JNIUtil.h?rev=1426106&r1=1426105&r2=1426106&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/JNIUtil.h
(original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/JNIUtil.h
Thu Dec 27 02:55:12 2012
@@ -41,6 +41,8 @@ struct svn_error_t;
#define JAVA_PACKAGE "org/apache/subversion/javahl"
+struct svn_string_t;
+
/**
* Class to hold a number of JNI related utility methods. No Objects
* of this class are ever created.
@@ -62,7 +64,8 @@ class JNIUtil
int aprErr = -1);
static void throwNullPointerException(const char *message);
- static jbyteArray makeJByteArray(const signed char *data, int length);
+ static jbyteArray makeJByteArray(const void *data, int length);
+ static jbyteArray makeJByteArray(const svn_string_t *str);
static jobject createDate(apr_time_t time);
static apr_time_t getDate(jobject jdate);
static void logMessage(const char *message);
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/native/OutputStream.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/OutputStream.cpp?rev=1426106&r1=1426105&r2=1426106&view=diff
==============================================================================
---
subversion/branches/javahl-ra/subversion/bindings/javahl/native/OutputStream.cpp
(original)
+++
subversion/branches/javahl-ra/subversion/bindings/javahl/native/OutputStream.cpp
Thu Dec 27 02:55:12 2012
@@ -95,9 +95,7 @@ svn_error_t *OutputStream::write(void *b
}
// convert the data to a Java byte array
- jbyteArray data = JNIUtil::makeJByteArray
- (reinterpret_cast<const signed char*>(buffer),
- static_cast<int>(*len));
+ jbyteArray data = JNIUtil::makeJByteArray(buffer, static_cast<int>(*len));
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/native/RevisionRange.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/RevisionRange.cpp?rev=1426106&r1=1426105&r2=1426106&view=diff
==============================================================================
---
subversion/branches/javahl-ra/subversion/bindings/javahl/native/RevisionRange.cpp
(original)
+++
subversion/branches/javahl-ra/subversion/bindings/javahl/native/RevisionRange.cpp
Thu Dec 27 02:55:12 2012
@@ -20,7 +20,7 @@
* ====================================================================
* @endcopyright
*
- * @file RevisionRanges.cpp
+ * @file RevisionRange.cpp
* @brief Implementation of the class RevisionRange.
*/
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp?rev=1426106&r1=1426105&r2=1426106&view=diff
==============================================================================
---
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp
(original)
+++
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp
Thu Dec 27 02:55:12 2012
@@ -855,9 +855,7 @@ jbyteArray SVNClient::propertyGet(const
if (propval == NULL)
return NULL;
- return JNIUtil::makeJByteArray
- (reinterpret_cast<const signed char *>(propval->data),
- static_cast<int>(propval->len));
+ return JNIUtil::makeJByteArray(propval);
}
void SVNClient::properties(const char *path, Revision &revision,
@@ -1164,9 +1162,7 @@ jbyteArray SVNClient::revProperty(const
if (propval == NULL)
return NULL;
- return JNIUtil::makeJByteArray
- (reinterpret_cast<const signed char *>(propval->data),
- static_cast<int>(propval->len));
+ return JNIUtil::makeJByteArray(propval);
}
void SVNClient::relocate(const char *from, const char *to, const char *path,
bool ignoreExternals)
@@ -1278,8 +1274,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(
- const_cast<apr_array_header_t*>(targetsApr), force,
- ctx, subPool.getPool()), );
+ targetsApr, force, ctx, subPool.getPool()), );
}
void SVNClient::setRevProperty(const char *path,
const char *name, Revision &rev,
