You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2014/04/06 16:03:18 UTC
[05/50] [abbrv] git commit: Bugfix: loadedFileUrls only contains the
last one of urls with same filename in XmlConfigurationProvider
Bugfix: loadedFileUrls only contains the last one of urls with same filename in XmlConfigurationProvider
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e80658d0
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e80658d0
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e80658d0
Branch: refs/heads/master
Commit: e80658d098b1af7101d4bb71db3b25923ebcd302
Parents: 3ceb3b9
Author: liang.liu <li...@dianping.com>
Authored: Mon Mar 17 16:23:43 2014 +0800
Committer: liang.liu <li...@dianping.com>
Committed: Mon Mar 17 16:23:43 2014 +0800
----------------------------------------------------------------------
.../xwork2/config/providers/XmlConfigurationProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/e80658d0/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java b/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
index 0939ab0..7a0a4e3 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
@@ -1015,6 +1015,7 @@ public class XmlConfigurationProvider implements ConfigurationProvider {
in.setSystemId(url.toString());
docs.add(DomHelper.parse(in, dtdMappings));
+ loadedFileUrls.add(url.toString());
} catch (XWorkException e) {
if (includeElement != null) {
throw new ConfigurationException("Unable to load " + url, e, includeElement);
@@ -1071,7 +1072,6 @@ public class XmlConfigurationProvider implements ConfigurationProvider {
}
}
finalDocs.add(doc);
- loadedFileUrls.add(url.toString());
}
if (LOG.isDebugEnabled()) {