summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules/binding-sca-runtime
diff options
context:
space:
mode:
Diffstat (limited to 'sca-java-2.x/trunk/modules/binding-sca-runtime')
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java10
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java1
2 files changed, 5 insertions, 6 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
index c4466a9d90..734e4137ef 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
@@ -65,10 +65,6 @@ public class DefaultSCABindingMapper implements SCABindingMapper {
public DefaultSCABindingMapper(ExtensionPointRegistry registry, Map<String, String> attributes) {
this.registry = registry;
- providerFactories = registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);
- BuilderExtensionPoint builders = registry.getExtensionPoint(BuilderExtensionPoint.class);
- StAXArtifactProcessorExtensionPoint processors =
- registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
if (attributes != null) {
String qname = attributes.get("mappedBinding");
if (qname != null) {
@@ -86,8 +82,10 @@ public class DefaultSCABindingMapper implements SCABindingMapper {
}
}
+ providerFactories = registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);
+ StAXArtifactProcessorExtensionPoint processors =
+ registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
processor = processors.getProcessor(mappedBinding);
- builder = builders.getBindingBuilder(mappedBinding);
if (processor == null) {
logger.warning("Mapped binding for binding.sca is not supported: " + mappedBinding);
}
@@ -104,6 +102,8 @@ public class DefaultSCABindingMapper implements SCABindingMapper {
} catch (Throwable e) {
throw new ServiceRuntimeException(e);
}
+ BuilderExtensionPoint builders = registry.getExtensionPoint(BuilderExtensionPoint.class);
+ builder = builders.getBindingBuilder(mappedBinding);
remotable = isDistributed() && processor != null;
}
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
index 119d66d14d..d968e2891d 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
@@ -69,7 +69,6 @@ public class SCABindingTestCase {
extensionPoints.getExtensionPoint(FactoryExtensionPoint.class).getFactory(SCABindingFactory.class);
Assert.assertNotNull(factory.createSCABinding());
- Assert.assertNotNull(factory.createDistributedSCABinding());
}
@Test