Copy r810812, r810816, r810830, r810833 and r810848 changes from 1.5.1 branch to 1.x branch

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

1 files changed, 4 insertions, 0 deletions

diff --git a/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/SourceImpl.java b/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/SourceImpl.java
index b9a0c7ff74..72bf552a1e 100644
--- a/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/SourceImpl.java
+++ b/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/SourceImpl.java
@@ -27,6 +27,7 @@ import org.osoa.sca.annotations.Service;
 @Scope("COMPOSITE")
 public class SourceImpl implements Source, SourceCallback {
 
+    public static int callbackCount = 0;
     private Target targetReference;
     private Target targetReference2;
 
@@ -49,6 +50,9 @@ public class SourceImpl implements Source, SourceCallback {
     }
 
     public void receiveResult(String result) {
+        synchronized(this) {
+            callbackCount += 1;
+        }
         System.out.println("Work thread " + Thread.currentThread());
         System.out.println("Result: " + result);
     }