geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r526866 - /geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/IOUtil.java
Date Mon, 09 Apr 2007 18:28:34 GMT
Author: dwoods
Date: Mon Apr  9 11:28:33 2007
New Revision: 526866

URL: http://svn.apache.org/viewvc?view=rev&rev=526866
Log:
GERONIMO-3016 Server assemblies fail to start on Windows when there is a space in the path.
 Verified this fixes the startup failure on WinXP and verified it doesn't break Linux.  Frank,
thanks for the patch.

Modified:
    geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/IOUtil.java

Modified: geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/IOUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/IOUtil.java?view=diff&rev=526866&r1=526865&r2=526866
==============================================================================
--- geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/IOUtil.java
(original)
+++ geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/IOUtil.java
Mon Apr  9 11:28:33 2007
@@ -189,7 +189,7 @@
             if (!SelectorUtils.hasWildcards(pattern)) {
                 File match = new File(root, pattern);
                 if (match.exists() && match.canRead()) {
-                    return Collections.singleton(match.toURI().normalize().toURL());
+                    return Collections.singleton( new URL( "file:" + match.toURI().normalize().getPath()
) );
                 } else {
                     return Collections.EMPTY_SET;
                 }
@@ -201,7 +201,7 @@
                     String fileName = (String) entry.getKey();
                     if (SelectorUtils.matchPath(pattern, fileName)) {
                         File file = (File) entry.getValue();
-                        matches.add(file.toURI().normalize().toURL());
+                        matches.add( new URL( "file:" + file.toURI().normalize().getPath()
) );
                     }
                 }
                 return matches;



Mime
View raw message