geronimo-xbean-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r936567 - in /geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder: ResourceFinder.java UrlSet.java
Date Wed, 21 Apr 2010 23:41:33 GMT
Author: djencks
Date: Wed Apr 21 23:41:32 2010
New Revision: 936567

URL: http://svn.apache.org/viewvc?rev=936567&view=rev
Log:
Fix some creation of invaled URLS, cf. OPENEJB-1252

Modified:
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ResourceFinder.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/UrlSet.java

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ResourceFinder.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ResourceFinder.java?rev=936567&r1=936566&r2=936567&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ResourceFinder.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ResourceFinder.java
Wed Apr 21 23:41:32 2010
@@ -860,7 +860,7 @@ public class ResourceFinder {
             for (File file : files) {
                 if (!file.isDirectory()) {
                     String name = file.getName();
-                    URL url = file.toURL();
+                    URL url = file.toURI().toURL();
                     resources.put(name, url);
                 }
             }

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/UrlSet.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/UrlSet.java?rev=936567&r1=936566&r2=936567&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/UrlSet.java (original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/UrlSet.java Wed
Apr 21 23:41:32 2010
@@ -154,7 +154,7 @@ public class UrlSet {
     }
 
     public UrlSet relative(File file) throws MalformedURLException {
-        String urlPath = file.toURL().toExternalForm();
+        String urlPath = file.toURI().toURL().toExternalForm();
         Map<String, URL> urls = new HashMap<String, URL>();
         for (Map.Entry<String, URL> entry : this.urls.entrySet()) {
             String url = entry.getKey();



Mime
View raw message