svn commit: r1232873 - in /openejb/trunk/openejb/server/openejb-ssh/src: main/java/org/apache/openejb/server/ssh/OpenEJBCommands.java test/java/org/apache/openejb/server/ssh/SSHServerTest.java

[rm...@apache.org]

Author: rmannibucau
Date: Wed Jan 18 13:09:52 2012
New Revision: 1232873

URL: http://svn.apache.org/viewvc?rev=1232873&view=rev
Log:
oops the infinite loop was still here

Modified:
    openejb/trunk/openejb/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBCommands.java
    openejb/trunk/openejb/server/openejb-ssh/src/test/java/org/apache/openejb/server/ssh/SSHServerTest.java

Modified: openejb/trunk/openejb/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBCommands.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBCommands.java?rev=1232873&r1=1232872&r2=1232873&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBCommands.java (original)
+++ openejb/trunk/openejb/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBCommands.java Wed Jan 18 13:09:52 2012
@@ -22,6 +22,19 @@ public class OpenEJBCommands implements 
     public static final String OS_LINE_SEP = System.getProperty("line.separator");
     public static final String PROMPT = "openejb> ";
 
+    static {
+        System.setProperty("line.separator", LINE_SEP);
+        try {
+            // just to force the loading of this class with the set line.separator
+            // because ConsoleReader.CR is a constant and we need sometimes another value
+            // not a big issue but keeping this as a workaround
+            final ConsoleReader reader = new ConsoleReader();
+        } catch (IOException ignored) {
+            // no-op
+        }
+        System.setProperty("line.separator", OS_LINE_SEP);
+    }
+
     private OpenEJBGroovyShell shell;
     private OutputStreamWriter serr;
     private OutputStreamWriter sout;
@@ -69,12 +82,8 @@ public class OpenEJBCommands implements 
     @Override
     public void run() {
         try {
-            System.setProperty("line.separator", LINE_SEP);
-            final ConsoleReader reader;
-            synchronized (OpenEJBCommands.class) {
-                reader = new ConsoleReader(sin, sout);
-            }
-            System.setProperty("line.separator", OS_LINE_SEP);
+            
+            final ConsoleReader reader = new ConsoleReader(sin, sout);
             // TODO : add completers with method names...?
 
             String name = "OpenEJB";

Modified: openejb/trunk/openejb/server/openejb-ssh/src/test/java/org/apache/openejb/server/ssh/SSHServerTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-ssh/src/test/java/org/apache/openejb/server/ssh/SSHServerTest.java?rev=1232873&r1=1232872&r2=1232873&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-ssh/src/test/java/org/apache/openejb/server/ssh/SSHServerTest.java (original)
+++ openejb/trunk/openejb/server/openejb-ssh/src/test/java/org/apache/openejb/server/ssh/SSHServerTest.java Wed Jan 18 13:09:52 2012
@@ -46,11 +46,6 @@ public class SSHServerTest {
 
     @Test
     public void call() {
-        while (Thread.currentThread().isAlive()) try {
-            Thread.sleep(100);
-        } catch (InterruptedException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
         System.out.println("ok");
     }
 }