fix for http://code.google.com/p/mybatis/issues/detail?id=317 . Loading more than one file with the same namespace should work.

Author: emacarron

src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java

@@ -87,31 +87,37 @@ public MapperAnnotationBuilder(Configuration configuration, Class<?> type) {
   }
 
   public void parse() {
-    String namespace = type.getName();
-    assistant.setCurrentNamespace(namespace);
-    if (!configuration.isResourceLoaded(namespace)) {
+    String resource = type.toString();
+    if (!configuration.isResourceLoaded(resource)) { 
       loadXmlResource();
-    }
-    parseCache();
-    parseCacheRef();
-    Method[] methods = type.getMethods();
-    for (Method method : methods) {
-      parseResultsAndConstructorArgs(method);
-      parseStatement(method);
+      configuration.addLoadedResource(resource);
+      assistant.setCurrentNamespace(type.getName());
+      parseCache();
+      parseCacheRef();
+      Method[] methods = type.getMethods();
+      for (Method method : methods) {
+        parseResultsAndConstructorArgs(method);
+        parseStatement(method);
+      }
     }
   }
 
   private void loadXmlResource() {
-    String xmlResource = type.getName().replace('.', '/') + ".xml";
-    InputStream inputStream = null;
-    try {
-      inputStream = Resources.getResourceAsStream(type.getClassLoader(), xmlResource);
-    } catch (IOException e) {
-      // ignore, resource is not required
-    }
-    if (inputStream != null) {
-      XMLMapperBuilder xmlParser = new XMLMapperBuilder(inputStream, assistant.getConfiguration(), xmlResource, configuration.getSqlFragments(), type.getName());
-      xmlParser.parse();
+    // Spring may not know the real resource name so we check a flag
+    // to prevent loading again a resource twice
+    // this flag is set at XMLMapperBuilder#bindMapperForNamespace
+    if (!configuration.isResourceLoaded("namespace:" + type.getName())) {
+      String xmlResource = type.getName().replace('.', '/') + ".xml";
+      InputStream inputStream = null;
+      try {
+        inputStream = Resources.getResourceAsStream(type.getClassLoader(), xmlResource);
+      } catch (IOException e) {
+        // ignore, resource is not required
+      }
+      if (inputStream != null) {
+        XMLMapperBuilder xmlParser = new XMLMapperBuilder(inputStream, assistant.getConfiguration(), xmlResource, configuration.getSqlFragments(), type.getName());
+        xmlParser.parse();
+      }
     }
   }
 

src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java

@@ -12,6 +12,7 @@
 import java.util.Properties;
 
 import org.apache.ibatis.builder.BaseBuilder;
+import org.apache.ibatis.builder.BuilderException;
 import org.apache.ibatis.builder.CacheRefResolver;
 import org.apache.ibatis.builder.IncompleteCacheException;
 import org.apache.ibatis.builder.MapperBuilderAssistant;
@@ -35,6 +36,7 @@ public class XMLMapperBuilder extends BaseBuilder {
   private XPathParser parser;
   private MapperBuilderAssistant builderAssistant;
   private Map<String, XNode> sqlFragments;
+  private String resource;
 
   @Deprecated
   public XMLMapperBuilder(Reader reader, Configuration configuration, String resource, Map<String, XNode> sqlFragments, String namespace) {
@@ -63,27 +65,28 @@ private XMLMapperBuilder(XPathParser parser, Configuration configuration, String
     this.builderAssistant = new MapperBuilderAssistant(configuration, resource);
     this.parser = parser;
     this.sqlFragments = sqlFragments;
+    this.resource = resource;
   }
-    
+  
   public void parse() {
-    XNode context = parser.evalNode("/mapper");
-    String namespace = context.getStringAttribute("namespace");
-    builderAssistant.setCurrentNamespace(namespace);
-    if (!configuration.isResourceLoaded(namespace)) {
-      configurationElement(context);
-      configuration.addLoadedResource(namespace);
+    if (!configuration.isResourceLoaded(resource)) {
+      configurationElement(parser.evalNode("/mapper"));
+      configuration.addLoadedResource(resource);
       bindMapperForNamespace();
-      parsePendingChacheRefs();
-      parsePendingStatements();
     }
+    
+    parsePendingChacheRefs();
+    parsePendingStatements();
   }
-
+      
   public XNode getSqlFragment(String refid) {
     return sqlFragments.get(refid);
   }
 
   private void configurationElement(XNode context) {
     try {
+      String namespace = context.getStringAttribute("namespace");
+      builderAssistant.setCurrentNamespace(namespace);
       cacheRefElement(context.evalNode("cache-ref"));
       cacheElement(context.evalNode("cache"));
       parameterMapElement(context.evalNodes("/mapper/parameterMap"));
@@ -93,7 +96,6 @@ private void configurationElement(XNode context) {
     } catch (Exception e) {
       throw new RuntimeException("Error parsing Mapper XML. Cause: " + e, e);
     }
-
   }
 
   private void buildStatementFromContext(List<XNode> list) {
@@ -305,6 +307,10 @@ private void bindMapperForNamespace() {
       }
       if (boundType != null) {
         if (!configuration.hasMapper(boundType)) {
+          // Spring may not know the real resource name so we set a flag
+          // to prevent loading again this resource from the mapper interface
+          // look at MapperAnnotationBuilder#loadXmlResource
+          configuration.addLoadedResource("namespace:" + namespace);
           configuration.addMapper(boundType);
         }
       }