Bug 455721 - Calling Framework.stop twice will potentially cause subsequent framework.start to hangI20150805-2000I20150805-0800I20150804-2000I20150804-0800I20150803-2000I20150803-0800I20150802-2000

1 files changed, 15 insertions, 6 deletions

diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainer.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainer.java
index 6a4b19d21..5f01e167d 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainer.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainer.java
@@ -157,17 +157,26 @@ public class EquinoxContainer implements ThreadFactory, Runnable {
 	}
 
 	void close() {
+		EventManager currentEventManager;
+		StorageSaver currentSaver;
+		Storage currentStorage;
+		ScheduledExecutorService currentExecutor;
 		synchronized (this.monitor) {
-			eventManager.close();
+			currentEventManager = eventManager;
 			eventManager = null;
 			eventPublisher = null;
 			serviceRegistry = null;
-			storageSaver.close();
-			storage.close();
-			// Must be done last since it will result in termination of the 
-			// framework active thread.
-			executor.shutdown();
+			currentSaver = storageSaver;
+			currentStorage = storage;
+			currentExecutor = executor;
 		}
+		// do this outside of the lock to avoid deadlock
+		currentEventManager.close();
+		currentSaver.close();
+		currentStorage.close();
+		// Must be done last since it will result in termination of the 
+		// framework active thread.
+		currentExecutor.shutdown();
 	}
 
 	private void initializeContextFinder() {