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

[rhuijben]

Author: rhuijben
Date: Fri Jun  3 23:25:21 2011
New Revision: 1131285

URL: http://svn.apache.org/viewvc?rev=1131285&view=rev
Log:
* subversion/bindings/javahl/native/JNIUtil.cpp
  (JNIUtil::preprocessPath): Resolve a deprecation warning by using the right
    canonicalization function in the right place.
    (The dirent codepath already canonicalized the path earlier)

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=1131285&r1=1131284&r2=1131285&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp Fri Jun  3 
23:25:21 2011
@@ -948,6 +948,9 @@ svn_error_t *JNIUtil::preprocessPath(con
         return svn_error_createf(SVN_ERR_BAD_URL, NULL,
                                  _("URL '%s' contains a '..' element"),
                                  path);
+
+      /* strip any trailing '/' */
+      path = svn_uri_canonicalize(path, pool);
     }
   else  /* not a url, so treat as a path */
     {
@@ -974,8 +977,6 @@ svn_error_t *JNIUtil::preprocessPath(con
       /* For kicks and giggles, let's absolutize it. */
       SVN_ERR(svn_dirent_get_absolute(&path, path, pool));
     }
-    /* strip any trailing '/' */
-    path = svn_path_canonicalize(path, pool);
 
   return NULL;
 }