You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2013/06/11 06:00:26 UTC
svn commit: r1491685 - in /subversion/branches/1.7.x: ./ STATUS
subversion/bindings/javahl/native/JNIUtil.cpp
Author: svn-role
Date: Tue Jun 11 04:00:26 2013
New Revision: 1491685
URL: http://svn.apache.org/r1491685
Log:
Merge r1405922 from trunk:
* r1405922
Fix bug in error-constructing code in JavaHL.
Justification:
Bug that seems to be related to spurious JavaHL test failures I'm seeing,
where absolute paths are passed into svn_relpath_dirname().
Could cause worse issues such as abort() crashing Eclipse. Simple fix.
Votes:
+1: stsp, rhuijben
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/bindings/javahl/native/JNIUtil.cpp
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1405922
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1491685&r1=1491684&r2=1491685&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Tue Jun 11 04:00:26 2013
@@ -182,12 +182,3 @@ Veto-blocked changes:
Approved changes:
=================
- * r1405922
- Fix bug in error-constructing code in JavaHL.
- Justification:
- Bug that seems to be related to spurious JavaHL test failures I'm seeing,
- where absolute paths are passed into svn_relpath_dirname().
- Could cause worse issues such as abort() crashing Eclipse. Simple fix.
- Votes:
- +1: stsp, rhuijben
-
Modified: subversion/branches/1.7.x/subversion/bindings/javahl/native/JNIUtil.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/bindings/javahl/native/JNIUtil.cpp?rev=1491685&r1=1491684&r2=1491685&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/bindings/javahl/native/JNIUtil.cpp (original)
+++ subversion/branches/1.7.x/subversion/bindings/javahl/native/JNIUtil.cpp Tue Jun 11 04:00:26 2013
@@ -376,7 +376,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 = '.';
@@ -384,7 +384,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;