Fix for TUSCANY-2860

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

13 files changed, 13 insertions, 13 deletions

diff --git a/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java b/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
index 426d7beb29..3c25424325 100644
--- a/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
+++ b/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
@@ -60,7 +60,7 @@ public class DefaultPackageProcessorExtensionPoint implements PackageProcessorEx
         return processors.get(contentType);
     }
 
-    private void loadProcessors() {
+    private synchronized void loadProcessors() {
         if (loaded)
             return;
 
diff --git a/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java b/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
index dfc4e9f57a..a16889031c 100644
--- a/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
+++ b/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
@@ -155,7 +155,7 @@ public class DefaultStAXArtifactProcessorExtensionPoint extends
     /**
      * Lazily load artifact processors registered in the extension point.
      */
-    private void loadArtifactProcessors() {
+    private synchronized void loadArtifactProcessors() {
         if (loaded)
             return;
 
diff --git a/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java b/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
index d81e236b40..29df0e861c 100644
--- a/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
+++ b/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
@@ -148,7 +148,7 @@ public class DefaultStAXAttributeProcessorExtensionPoint extends
     /**
      * Lazily load artifact processors registered in the extension point.
      */
-    private void loadArtifactProcessors() {
+    private synchronized void loadArtifactProcessors() {
         if (loaded)
             return;
 
diff --git a/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java b/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
index 8a30129343..1e2f2f8109 100644
--- a/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
+++ b/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
@@ -122,7 +122,7 @@ public class DefaultURLArtifactProcessorExtensionPoint
     /**
      * Lazily load artifact processors registered in the extension point.
      */
-    private void loadProcessors() {
+    private synchronized void loadProcessors() {
         if (loaded)
             return;
 
diff --git a/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java b/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
index a6631f498e..9f4094aa12 100644
--- a/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
+++ b/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
@@ -51,7 +51,7 @@ public class DefaultValidationSchemaExtensionPoint implements ValidationSchemaEx
      * Load schema declarations from META-INF/services/
      * org.apache.tuscany.sca.contribution.processor.ValidationSchema files
      */
-    private void loadSchemas() {
+    private synchronized void loadSchemas() {
         if (loaded)
             return;
 
diff --git a/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java b/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
index 5c3242e6b3..61a6d084f2 100644
--- a/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
+++ b/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
@@ -92,7 +92,7 @@ public class DefaultModelResolverExtensionPoint implements ModelResolverExtensio
     /**
      * Dynamically load model resolvers declared under META-INF/services
      */
-    private void loadModelResolvers() {
+    private synchronized void loadModelResolvers() {
         if (loadedResolvers != null)
             return;
         loadedResolvers = new HashMap<String, ServiceDeclaration>();
diff --git a/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java b/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
index 24aae45b59..cca1ae7a30 100644
--- a/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
+++ b/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
@@ -57,7 +57,7 @@ public class DefaultContributionScannerExtensionPoint implements ContributionSca
         return scanners.get(contentType);
     }
 
-    private void loadScanners() {
+    private synchronized void loadScanners() {
         if (loaded)
             return;
 
diff --git a/branches/sca-java-1.x/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java b/branches/sca-java-1.x/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java
index 2849c27c1a..04ac4ee20c 100644
--- a/branches/sca-java-1.x/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java
+++ b/branches/sca-java-1.x/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java
@@ -92,7 +92,7 @@ public class DefaultEndpointResolverFactoryExtensionPoint implements EndpointRes
      * Load provider factories declared under META-INF/services.
      * @param registry
      */
-    private void loadProviderFactories() {
+    private synchronized void loadProviderFactories() {
         if (loaded)
             return;
 
diff --git a/branches/sca-java-1.x/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java b/branches/sca-java-1.x/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
index 1edf612780..df46af121c 100644
--- a/branches/sca-java-1.x/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
+++ b/branches/sca-java-1.x/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
@@ -106,7 +106,7 @@ public class DefaultProviderFactoryExtensionPoint implements ProviderFactoryExte
      * Load provider factories declared under META-INF/services.
      * @param registry
      */
-    private void loadProviderFactories() {
+    private synchronized void loadProviderFactories() {
         if (loaded)
             return;
 
diff --git a/branches/sca-java-1.x/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java b/branches/sca-java-1.x/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
index 068d0d12d7..76ca061bab 100644
--- a/branches/sca-java-1.x/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
+++ b/branches/sca-java-1.x/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
@@ -59,7 +59,7 @@ public class DefaultSCADefinitionsProviderExtensionPoint implements
         return scaDefnsProviders;
     }
 
-    private void loadProviders() {
+    private synchronized void loadProviders() {
         // Get the provider service declarations
         Set<ServiceDeclaration> defnProviderDecls;
         SCADefinitionsProvider aProvider = null;
diff --git a/branches/sca-java-1.x/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java b/branches/sca-java-1.x/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
index 7aa55d2cff..e99dc2e029 100644
--- a/branches/sca-java-1.x/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
+++ b/branches/sca-java-1.x/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
@@ -109,7 +109,7 @@ public class DefaultTransformerExtensionPoint implements TransformerExtensionPoi
      * 
      * @param transformerClass
      */
-    private void loadTransformers(Class<?> transformerClass) {
+    private synchronized void loadTransformers(Class<?> transformerClass) {
 
         // Get the transformer service declarations
         Set<ServiceDeclaration> transformerDeclarations;
diff --git a/branches/sca-java-1.x/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java b/branches/sca-java-1.x/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
index 8ca030c0dd..dc60d693ed 100644
--- a/branches/sca-java-1.x/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
+++ b/branches/sca-java-1.x/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
@@ -58,7 +58,7 @@ public class DefaultModuleActivatorExtensionPoint implements ModuleActivatorExte
     /**
      * Dynamically load module activators declared under META-INF/services
      */
-    private void loadModuleActivators() {
+    private synchronized void loadModuleActivators() {
         if (loadedActivators)
             return;
 
diff --git a/branches/sca-java-1.x/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java b/branches/sca-java-1.x/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
index 7853b597d3..e10c023cda 100644
--- a/branches/sca-java-1.x/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
+++ b/branches/sca-java-1.x/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
@@ -56,7 +56,7 @@ public class DefaultJavaInterfaceFactory extends JavaInterfaceFactoryImpl implem
      * Load visitors declared under META-INF/services
      */
     @SuppressWarnings("unchecked")
-    private void loadVisitors() {
+    private synchronized void loadVisitors() {
         if (loadedVisitors)
             return;