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, 2 insertions, 4 deletions

diff --git a/branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java b/branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
index b5e77061d7..eb06ad7411 100644
--- a/branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
+++ b/branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
@@ -100,11 +100,9 @@ public class DomainManagerLauncher {
                 int k = 0;
                 try {
                     while ((k != 'q') && (k != 'r')) {
-                       // k = System.in.read();
-                    	Thread.sleep(100);
-                    	
+                        k = System.in.read();
                     }
-                } catch (Exception e) {
+                } catch (IOException e) {
                     
                     // Wait forever
                     Object lock = new Object();