[infinispan-commits] Infinispan SVN: r973 - in trunk/core/src/main/java/org/infinispan: util and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-10-19 12:36:34 -0400 (Mon, 19 Oct 2009)
New Revision: 973

Modified:
   trunk/core/src/main/java/org/infinispan/config/InfinispanConfiguration.java
   trunk/core/src/main/java/org/infinispan/util/FileLookup.java
Log:
More user-friendly config exceptions

Modified: trunk/core/src/main/java/org/infinispan/config/InfinispanConfiguration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/InfinispanConfiguration.java	2009-10-19 16:16:15 UTC (rev 972)
+++ trunk/core/src/main/java/org/infinispan/config/InfinispanConfiguration.java	2009-10-19 16:36:34 UTC (rev 973)
@@ -203,14 +203,18 @@
                }
             });
          }
-         
+
          InfinispanConfiguration ic = (InfinispanConfiguration) u.unmarshal(config);     
          // legacy, don't ask
-         ic.parseGlobalConfiguration().setDefaultConfiguration(ic.parseDefaultConfiguration());
+         GlobalConfiguration gconf = ic.parseGlobalConfiguration();
+         if (gconf == null) throw new ConfigurationException("Unable to parse configuration file.  Possibly an old or invalid configuration file?");
+         gconf.setDefaultConfiguration(ic.parseDefaultConfiguration());
          if (cbv != null) {
             ic.accept(cbv);
          }
          return ic;
+      } catch (ConfigurationException cex) {
+         throw cex;
       } catch (NullPointerException npe) {
          throw npe;
       } catch (Exception e) {

Modified: trunk/core/src/main/java/org/infinispan/util/FileLookup.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/FileLookup.java	2009-10-19 16:16:15 UTC (rev 972)
+++ trunk/core/src/main/java/org/infinispan/util/FileLookup.java	2009-10-19 16:36:34 UTC (rev 973)
@@ -49,7 +49,7 @@
     * @return an input stream to the file or null if nothing found through all lookup steps.
     */
    public InputStream lookupFile(String filename) {
-      InputStream is = getAsInputStreamFromClassLoader(filename);
+      InputStream is = filename == null || filename.equals("") ? null : getAsInputStreamFromClassLoader(filename);
       if (is == null) {
          if (log.isDebugEnabled())
             log.debug("Unable to find configuration file " + filename + " in classpath; searching for this file on the filesystem instead.");