From e80658d098b1af7101d4bb71db3b25923ebcd302 Mon Sep 17 00:00:00 2001
From: "liang.liu" <liang.liu@dianping.com>
Date: Mon, 17 Mar 2014 16:23:43 +0800
Subject: [PATCH] Bugfix: loadedFileUrls only contains the last one of urls
 with same filename in XmlConfigurationProvider

---
 .../xwork2/config/providers/XmlConfigurationProvider.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 0939ab0b4..7a0a4e32e 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()) {