You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-cvs@xml.apache.org by nd...@apache.org on 2006/04/14 15:30:32 UTC

svn commit: r394093 - in /xml/commons/trunk/java/src/org/apache/xml/resolver: Catalog.java apps/resolver.java helpers/FileURL.java

Author: ndw
Date: Fri Apr 14 06:30:30 2006
New Revision: 394093

URL: http://svn.apache.org/viewcvs?rev=394093&view=rev
Log:
Apply Dave Brosius's patch to fix ASF Bugzilla Bug 35078: improper use of String.replace

Modified:
    xml/commons/trunk/java/src/org/apache/xml/resolver/Catalog.java
    xml/commons/trunk/java/src/org/apache/xml/resolver/apps/resolver.java
    xml/commons/trunk/java/src/org/apache/xml/resolver/helpers/FileURL.java

Modified: xml/commons/trunk/java/src/org/apache/xml/resolver/Catalog.java
URL: http://svn.apache.org/viewcvs/xml/commons/trunk/java/src/org/apache/xml/resolver/Catalog.java?rev=394093&r1=394092&r2=394093&view=diff
==============================================================================
--- xml/commons/trunk/java/src/org/apache/xml/resolver/Catalog.java (original)
+++ xml/commons/trunk/java/src/org/apache/xml/resolver/Catalog.java Fri Apr 14 06:30:30 2006
@@ -820,7 +820,7 @@
       catalogCwd = FileURL.makeURL("basename");
     } catch (MalformedURLException e) {
       String userdir = System.getProperty("user.dir");
-      userdir.replace('\\', '/');
+      userdir = userdir.replace('\\', '/');
       catalogManager.debug.message(1, "Malformed URL on cwd", userdir);
       catalogCwd = null;
     }

Modified: xml/commons/trunk/java/src/org/apache/xml/resolver/apps/resolver.java
URL: http://svn.apache.org/viewcvs/xml/commons/trunk/java/src/org/apache/xml/resolver/apps/resolver.java?rev=394093&r1=394092&r2=394093&view=diff
==============================================================================
--- xml/commons/trunk/java/src/org/apache/xml/resolver/apps/resolver.java (original)
+++ xml/commons/trunk/java/src/org/apache/xml/resolver/apps/resolver.java Fri Apr 14 06:30:30 2006
@@ -198,7 +198,7 @@
 	base = FileURL.makeURL("basename");
       } catch (MalformedURLException e) {
 	String userdir = System.getProperty("user.dir");
-	userdir.replace('\\', '/');
+	userdir = userdir.replace('\\', '/');
 	debug.message(1, "Malformed URL on cwd", userdir);
 	base = null;
       }

Modified: xml/commons/trunk/java/src/org/apache/xml/resolver/helpers/FileURL.java
URL: http://svn.apache.org/viewcvs/xml/commons/trunk/java/src/org/apache/xml/resolver/helpers/FileURL.java?rev=394093&r1=394092&r2=394093&view=diff
==============================================================================
--- xml/commons/trunk/java/src/org/apache/xml/resolver/helpers/FileURL.java (original)
+++ xml/commons/trunk/java/src/org/apache/xml/resolver/helpers/FileURL.java Fri Apr 14 06:30:30 2006
@@ -74,7 +74,7 @@
     }
 
     String userdir = System.getProperty("user.dir");
-    userdir.replace('\\', '/');
+    userdir = userdir.replace('\\', '/');
 
     if (userdir.endsWith("/")) {
       return new URL("file:///" + userdir + pathname);