Index: subversion/bindings/javahl/native/ProplistCallback.cpp
===================================================================
--- subversion/bindings/javahl/native/ProplistCallback.cpp	(revision 24551)
+++ subversion/bindings/javahl/native/ProplistCallback.cpp	(working copy)
@@ -22,7 +22,6 @@
 #include "ProplistCallback.h"
 #include "JNIUtil.h"
 #include "svn_time.h"
-#include "svn_path.h"
 
 /**
  * Create a ProplistCallback object
@@ -86,8 +85,7 @@
     }
 
     // convert the parameters to their java relatives
-    jstring jpath = JNIUtil::makeJString(svn_path_local_style(path->data,
-                                                              pool));
+    jstring jpath = JNIUtil::makeJString(path->data);
     if (JNIUtil::isJavaExceptionThrown())
         return SVN_NO_ERROR;
 
Index: subversion/bindings/javahl/src/org/tigris/subversion/javahl/tests/BasicTests.java
===================================================================
--- subversion/bindings/javahl/src/org/tigris/subversion/javahl/tests/BasicTests.java	(revision 24551)
+++ subversion/bindings/javahl/src/org/tigris/subversion/javahl/tests/BasicTests.java	(working copy)
@@ -605,7 +605,7 @@
         WC wc = thisTest.getWc();
 
         // Check getting properties the non-callback way
-        String itemPath = new File(thisTest.getWCPath(), "iota").getPath();
+        String itemPath = fileToSVNPath(new File(thisTest.getWCPath(), "iota"), false);
 
         client.propertySet(itemPath, "abc", "def", false);
         PropertyData[] properties =
@@ -619,7 +619,7 @@
         thisTest.checkStatus();
 
         // Check getting properties the callback way
-        itemPath = new File(thisTest.getWCPath(), "/A/B/E/alpha").getPath();
+        itemPath = fileToSVNPath(new File(thisTest.getWCPath(), "/A/B/E/alpha"), false);
         client.propertySet(itemPath, "cqcq", "qrz", false);
         ProplistCallbackImpl callback = new ProplistCallbackImpl();
 
@@ -2502,6 +2502,25 @@
             assertEquals("jrandom", line.getAuthor());
         }
     }
+    
+    private String fileToSVNPath(File file, boolean canonical)
+    {
+        // JavaHL need paths with '/' separators
+        if (canonical)
+        {
+            try
+            {
+                return file.getCanonicalPath().replace('\\', '/');
+            }
+            catch (IOException e)
+            {
+                return null;
+            }
+        }
+        else
+            return file.getPath().replace('\\', '/');
+    }
+    
 
     /**
      * A DiffSummaryReceiver implementation which collects all DiffSummary