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, 6 insertions, 7 deletions

diff --git a/branches/sca-java-1.x/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java b/branches/sca-java-1.x/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
index 9e9a4b44a4..980552ac06 100644
--- a/branches/sca-java-1.x/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
+++ b/branches/sca-java-1.x/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
@@ -39,13 +39,12 @@ public class CompositeTestCase extends TestCase {
     }
 
     public void test() throws Exception {
-        try {
-            System.out.println("Main thread " + Thread.currentThread());
-            source.clientMethod("Client.main");
-            System.out.println("Sleeping ...");
-            Thread.sleep(1000);
-        } catch (Throwable t) {
-            t.printStackTrace();
+        System.out.println("Main thread " + Thread.currentThread());
+        source.clientMethod("Client.main");
+        System.out.println("Sleeping ...");
+        Thread.sleep(1000);
+        if (SourceImpl.callbackCount != 2) {
+            throw new IllegalStateException("Expected callbacks not received");
         }
     }
 }