From 4a7c9de9d568cb95c6b48cb288c60a63a13d0703 Mon Sep 17 00:00:00 2001 From: "Donald J. Brown" Date: Tue, 10 Oct 2006 18:06:01 +0000 Subject: [PATCH] Fixed loading of config files WW-1453 git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@454856 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/struts2/dispatcher/Dispatcher.java | 17 ++++++++++------- .../org/apache/struts2/config/SettingsTest.java | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java index d243dc734..64884216a 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java @@ -253,16 +253,19 @@ public class Dispatcher { } configurationManager = new ConfigurationManager(); + String configFiles = null; if (Settings.isSet(StrutsConstants.STRUTS_CONFIGURATION_FILES)) { configFiles = Settings.get(StrutsConstants.STRUTS_CONFIGURATION_FILES); } - String[] files = configFiles.split("\\s*[,]\\s*"); - for (String file : files) { - if ("xwork.xml".equals(file)) { - configurationManager.addConfigurationProvider(new XmlConfigurationProvider(file, false)); - } else { - configurationManager.addConfigurationProvider(new StrutsXmlConfigurationProvider(file, false)); - } + if (configFiles != null) { + String[] files = configFiles.split("\\s*[,]\\s*"); + for (String file : files) { + if ("xwork.xml".equals(file)) { + configurationManager.addConfigurationProvider(new XmlConfigurationProvider(file, false)); + } else { + configurationManager.addConfigurationProvider(new StrutsXmlConfigurationProvider(file, false)); + } + } } synchronized(Dispatcher.class) { diff --git a/core/src/test/java/org/apache/struts2/config/SettingsTest.java b/core/src/test/java/org/apache/struts2/config/SettingsTest.java index 06cad1db7..7abc6bc8b 100644 --- a/core/src/test/java/org/apache/struts2/config/SettingsTest.java +++ b/core/src/test/java/org/apache/struts2/config/SettingsTest.java @@ -45,7 +45,7 @@ public class SettingsTest extends StrutsTestCase { assertEquals("de", locale.getLanguage()); int count = getKeyCount(); - assertEquals(30, count); + assertEquals(31, count); } public void testDefaultResourceBundlesLoaded() {