svn commit: r1405922 - /subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp

[ju...@apache.org]

Author: julianfoad
Date: Mon Nov  5 18:57:55 2012
New Revision: 1405922

URL: http://svn.apache.org/viewvc?rev=1405922&view=rev
Log:
In the JavaHL bindings: fix error reporting.  It could fail an assertion
while trying to report an error trace.

* subversion/bindings/javahl/native/JNIUtil.cpp
  (putErrorsInTrace): Use 'dirent' functions to process a source file name,
    as this can be an absolute path depending on how it was compiled.

Modified:
    subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp

Modified: subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp?rev=1405922&r1=1405921&r2=1405922&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp Mon Nov  5 18:57:55 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;