Fixes for TUSCANY-3326, to consider the imported artifacts first and then the local artifacts

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@831239 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 10 insertions, 7 deletions

diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
index 9b02df8b7a..7a396fe100 100644
--- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
+++ b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
@@ -68,12 +68,9 @@ public class CompositeModelResolver implements ModelResolver {
 
         // Lookup a definition for the given namespace
         QName qname = ((Composite)unresolved).getName();
-        Composite resolved = (Composite) map.get(qname);
-        if (resolved != null) {
-            return modelClass.cast(resolved);
-        }
-
-        // No definition found, delegate the resolution to the imports
+        Composite resolved = null;
+        
+        // Delegate the resolution to the imports
         for (Import import_ : this.contribution.getImports()) {
             if (import_ instanceof NamespaceImport) {
                 NamespaceImport namespaceImport = (NamespaceImport)import_;
@@ -87,7 +84,13 @@ public class CompositeModelResolver implements ModelResolver {
                 }
             }
         }
+        
+        // No definition found, search within the current contribution
+        resolved = (Composite) map.get(qname);
+        if (resolved != null) {
+            return modelClass.cast(resolved);
+        }
+        
         return (T)unresolved;
     }
-
 }