Merge all changes from 1.5.2 branch into trunk

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

1 files changed, 4 insertions, 4 deletions

diff --git a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java b/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
index f4ba59e61b..e38f9104c0 100644
--- a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
+++ b/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
@@ -45,10 +45,10 @@ public class PropertiesTestCase {
 

         client.aClientMethod();

 

-        // wait for up to 5 seconds but should wake up as soon as done

+        // wait for up to 10 seconds but should wake up as soon as done

         synchronized(MsgServiceImpl.lock) {

             if (MsgServiceImpl.msg == null) {

-                MsgServiceImpl.lock.wait(5000);

+                MsgServiceImpl.lock.wait(10000);

             }

         }

         assertNotNull(MsgServiceImpl.msg);

@@ -66,10 +66,10 @@ public class PropertiesTestCase {
 

         client.op2();

 

-        // wait for up to 5 seconds but should wake up as soon as done

+        // wait for up to 10 seconds but should wake up as soon as done

         synchronized(MsgServiceImpl.lock) {

             if (MsgServiceImpl.msg == null) {

-                MsgServiceImpl.lock.wait(6000);

+                MsgServiceImpl.lock.wait(10000);

             }

         }

         assertNotNull(MsgServiceImpl.msg);