commit b96ceded5bee5307a7f8d6f3a0d4218de4b0530c
author Andrey Loskutov <loskutov@gmx.de> Mon Mar 06 00:22:49 2017 +0100
committer Andrey Loskutov <loskutov@gmx.de> Mon Mar 06 00:22:49 2017 +0100
tree a863d7a643a6f1cadd755f677cffe7a576a01c1e
parent 16af7a3ed05203a972e152b4d86f00a3557694e5

Bug 513128 - NPE on shutdown after error in start

Change-Id: I4afc85772d16a347f1063a6fbdb5651766f4c051
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>

bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ResourcesPlugin.java

diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ResourcesPlugin.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ResourcesPlugin.java
index 3e20d95..4bf9570 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ResourcesPlugin.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ResourcesPlugin.java
@@ -481,9 +481,12 @@
 		debugRegistration.unregister();
 		debugRegistration = null;
 
-		if (workspace == null)
+		if (workspace == null) {
 			return;
-		workspaceRegistration.unregister();
+		}
+		if (workspaceRegistration != null) {
+			workspaceRegistration.unregister();
+		}
 		// save the preferences for this plug-in
 		getPlugin().savePluginPreferences();
 		workspace.close(null);