[jbosscache-commits] JBoss Cache SVN: r6676 - core/trunk/src/main/java/org/jboss/cache.

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2008-09-02 09:03:30 -0400 (Tue, 02 Sep 2008)
New Revision: 6676

Modified:
   core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java
Log:
updated warnign message


Modified: core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java	2008-09-02 12:59:11 UTC (rev 6675)
+++ core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java	2008-09-02 13:03:30 UTC (rev 6676)
@@ -72,9 +72,10 @@
       }
       catch (ConfigurationException e)
       {
-         log.warn("Detected legacy configuration file format when parsing [" + configFileName + "].  Migrating to the new (3.x) file format is recommended.  See FAQs for details.");
          XmlConfigurationParser2x oldParser = new XmlConfigurationParser2x();
          c = oldParser.parseFile(configFileName);
+         if (c != null)
+           log.warn("Detected legacy configuration file format when parsing [" + configFileName + "].  Migrating to the new (3.x) file format is recommended.  See FAQs for details.");
       }
       return createCache(c, start);
    }
@@ -162,9 +163,9 @@
       }
       catch (ConfigurationException e)
       {
-         log.warn("Detected legacy configuration file format when parsing configuration file.  Migrating to the new (3.x) file format is recommended.  See FAQs for details.");
          XmlConfigurationParser2x oldParser = new XmlConfigurationParser2x();
          c = oldParser.parseStream(is);
+         if (c!= null) log.warn("Detected legacy configuration file format when parsing configuration file.  Migrating to the new (3.x) file format is recommended.  See FAQs for details.");
       }
       return createCache(c);
    }