Bug 269194 [console] thread is not shutdown if using console sockets

1 files changed, 5 insertions, 2 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 5c45a4b26..c1ddb0e67 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -473,7 +473,7 @@ public class FrameworkConsole implements Runnable {
 				lock.wait(); //TODO spurious wakeup not handled
 			}
 			setAcceptConnections(false);
-			return socket;
+			return shutdown ? null : socket;
 		}
 
 		/**
@@ -487,6 +487,9 @@ public class FrameworkConsole implements Runnable {
 
 		public void shutdown() throws IOException {
 			server.close();
+			synchronized (lock) {
+				lock.notify();
+			}
 		}
 	}