Bug 183288 - [console] Lockup condition during an interrupt

1 files changed, 19 insertions, 15 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 90ccef4ba..08a6734c7 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
@@ -217,7 +217,8 @@ public class FrameworkConsole implements Runnable {
 			try {
 				console();
 			} catch (IOException e) {
-				e.printStackTrace(out);
+				if (!shutdown)
+					e.printStackTrace(out);
 			}
 		}
 	}
@@ -299,20 +300,23 @@ public class FrameworkConsole implements Runnable {
 	public synchronized void disconnect() {
 		if (!disconnect) {
 			disconnect = true;
-			if (out != null)
-				out.close();
-			if (s != null)
-				try {
-					s.close();
-				} catch (IOException ioe) {
-					// do nothing
-				}
-			if (in != null)
-				try {
-					in.close();
-				} catch (IOException ioe) {
-					// do nothing
-				}
+			// We don't want to close System.in and System.out
+			if (useSocketStream) {
+				if (s != null)
+					try {
+						s.close();
+					} catch (IOException ioe) {
+						// do nothing
+					}
+				if (out != null)
+					out.close();
+				if (in != null)
+					try {
+						in.close();
+					} catch (IOException ioe) {
+						// do nothing
+					}
+			}
 		}
 	}