[Yanel-commits] rev 24111 - public/yanel/trunk/src/core/java/org/wyona/yanel/core/map

[josias at wyona.com]

Author: josias
Date: 2007-05-03 08:59:46 +0200 (Thu, 03 May 2007)
New Revision: 24111

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmConfiguration.java
Log:
fixed problem with spaces in filename. fixes bug #5325, thanks to jonathan

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmConfiguration.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmConfiguration.java	2007-05-02 19:32:06 UTC (rev 24110)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmConfiguration.java	2007-05-03 06:59:46 UTC (rev 24111)
@@ -21,6 +21,8 @@
 import java.lang.ClassNotFoundException;
 import java.lang.IllegalAccessException;
 import java.lang.InstantiationException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.util.LinkedHashMap;
@@ -87,10 +89,16 @@
         if (RealmConfiguration.class.getClassLoader().getResource(CONFIGURATION_FILE) != null) {
             if (CONFIGURATION_FILE.endsWith(".xml")) {
 
-                configFile = new File(RealmConfiguration.class.getClassLoader()
-                        .getResource(CONFIGURATION_FILE)
-                        .getFile());
                 try {
+                    URI configFileUri = new URI(RealmConfiguration.class.getClassLoader().getResource(CONFIGURATION_FILE).toString());
+                    configFile = new File(configFileUri.getPath());
+                } catch (Exception e) {
+                    String errorMsg = "Failure while reading configuration: " + e.getMessage();
+                    log.error(errorMsg, e);
+                    throw new ConfigurationException(errorMsg, e);
+                }     
+                
+                try {
                     DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
                     Configuration config;
                     config = builder.buildFromFile(configFile);