Fix for TUSCANY-2860

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

7 files changed, 7 insertions, 7 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;