diff options
author | Jeff McAffer | 2004-10-08 16:04:11 +0000 |
---|---|---|
committer | Jeff McAffer | 2004-10-08 16:04:11 +0000 |
commit | 72975aefec723dba1c5ed4276772c6a1914459e6 (patch) | |
tree | 07996479eedf73ede9cbcb222c2ddaea513c447e /bundles/org.eclipse.osgi/console | |
parent | 029048d25cd15a724e995d8e087395f558c4fbb7 (diff) | |
download | rt.equinox.framework-72975aefec723dba1c5ed4276772c6a1914459e6.tar.gz rt.equinox.framework-72975aefec723dba1c5ed4276772c6a1914459e6.tar.xz rt.equinox.framework-72975aefec723dba1c5ed4276772c6a1914459e6.zip |
*** empty log message ***v20041012av20041012
Diffstat (limited to 'bundles/org.eclipse.osgi/console')
-rw-r--r-- | bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/FrameworkConsole.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/FrameworkConsole.java b/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/FrameworkConsole.java index c0e38fb88..0292cfc76 100644 --- a/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/FrameworkConsole.java +++ b/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/FrameworkConsole.java @@ -251,24 +251,25 @@ public class FrameworkConsole implements Runnable { BufferedReader br = (BufferedReader) in; //cache the console prompt String String consolePrompt = "\r\n" + ConsoleMsg.formatter.getString("CONSOLE_PROMPT"); //$NON-NLS-1$ //$NON-NLS-2$ + boolean block = !("arm".equals(System.getProperty("osgi.arch"))); //$NON-NLS-1$ //$NON-NLS-2$ while (!disconnect) { out.print(consolePrompt); out.flush(); - // avoid waiting on input stream - apparently generates contention with other native calls - String cmdline = null; - try { - synchronized (lock) { - while (!br.ready()) { - lock.wait(300); + if (block) { + // avoid waiting on input stream - apparently generates contention with other native calls + try { + synchronized (lock) { + while (!br.ready()) + lock.wait(300); } + cmdline = br.readLine(); + } catch (InterruptedException e) { + // do nothing; probably got disconnected } + } else cmdline = br.readLine(); - } catch (InterruptedException e) { - // do nothing; probably got disconnected - } finally { - } if (cmdline == null) { break; @@ -316,6 +317,7 @@ public class FrameworkConsole implements Runnable { try { /** The buffered input reader on standard in. */ input = ((BufferedReader) in).readLine(); + System.out.println("<" + input + ">"); } catch (IOException e) { input = ""; //$NON-NLS-1$ } |