1 files changed, 8 insertions, 10 deletions
diff --git a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
index 66f6f0e090..d4de78c81a 100644
--- a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
+++ b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
@@ -598,23 +598,21 @@ public class NodeFactoryImpl extends NodeFactory {
                 tempComposite.getIncludes().add(composite);
             }
         }
-        
+
         // TODO - EPR - create a binding map to pass down into the builders
-        //              for use during URI calculation. 
-        Map<Class<?>, List<String>> bindingMap = new HashMap<Class<?>, List<String>>();
-        for (BindingConfiguration config : configuration.getBindings()){
-        	StAXArtifactProcessor<?> processor = xmlProcessors.getProcessor(config.getBindingType());
-        	Class<?> bindingClass = processor.getModelType();
-        	bindingMap.put(bindingClass, config.getBaseURIs());
+        //              for use during URI calculation.
+        Map<QName, List<String>> bindingMap = new HashMap<QName, List<String>>();
+        for (BindingConfiguration config : configuration.getBindings()) {
+            bindingMap.put(config.getBindingType(), config.getBaseURIs());
         }
-        
+
         // build the top level composite
         ((CompositeBuilderTmp)compositeBuilder).build(tempComposite, systemDefinitions, bindingMap, monitor);
         analyzeProblems();
-        
+
         endpointReferenceBuilder.build(tempComposite, systemDefinitions, monitor);
         analyzeProblems();
-        
+
         return tempComposite;
 
     }