diff options
| author | Andrey Loskutov | 2017-03-05 23:22:49 +0000 |
|---|---|---|
| committer | Andrey Loskutov | 2017-03-05 23:22:49 +0000 |
| commit | b96ceded5bee5307a7f8d6f3a0d4218de4b0530c (patch) | |
| tree | a863d7a643a6f1cadd755f677cffe7a576a01c1e | |
| parent | 16af7a3ed05203a972e152b4d86f00a3557694e5 (diff) | |
| download | eclipse.platform.resources-b96ceded5bee5307a7f8d6f3a0d4218de4b0530c.tar.gz eclipse.platform.resources-b96ceded5bee5307a7f8d6f3a0d4218de4b0530c.tar.xz eclipse.platform.resources-b96ceded5bee5307a7f8d6f3a0d4218de4b0530c.zip | |
Bug 513128 - NPE on shutdown after error in startI20170307-0800I20170307-0610I20170307-0450I20170307-0420I20170307-0410I20170307-0150I20170306-2000I20170306-0800
Change-Id: I4afc85772d16a347f1063a6fbdb5651766f4c051
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
| -rw-r--r-- | bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ResourcesPlugin.java | 7 |
1 files changed, 5 insertions, 2 deletions
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 3e20d95ac..4bf9570e4 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 @@ public final class ResourcesPlugin extends Plugin { 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); |