Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimeon Andreev2019-02-14 10:11:43 -0500
committerSimeon Andreev2019-02-14 10:12:39 -0500
commitdb1326bbb30b8a20e62ef481b5fe80d93f5f69cc (patch)
treeb401c2068f71bafb7b5cca6b69c9fe15b17d8d99 /dsf-gdb
parent31b4c257b10769a72182024cd77ed85eda01fd07 (diff)
downloadorg.eclipse.cdt-db1326bbb30b8a20e62ef481b5fe80d93f5f69cc.tar.gz
org.eclipse.cdt-db1326bbb30b8a20e62ef481b5fe80d93f5f69cc.tar.xz
org.eclipse.cdt-db1326bbb30b8a20e62ef481b5fe80d93f5f69cc.zip
Bug 543129 - NPE in GdbFullCliConsolePage.dispose()
With the fix for bug 536677, disposing a org.eclipse.ui.part.Page will dispose also its site. org.eclipse.cdt.dsf.gdb.internal.ui.console.GdbFullCliConsolePage.dispose() calls super.dispose() and then accesses the page site, which results in a NPE. This change changes the order of disposal to the natural order, extending class first and then the super. Change-Id: I853c8c426b9ea4e1403cd9af34f9878f6379f72a Signed-off-by: Simeon Andreev <simeon.danailov.andreev@gmail.com>
Diffstat (limited to 'dsf-gdb')
-rw-r--r--dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF2
-rw-r--r--dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/GdbFullCliConsolePage.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF
index a41c8e9ebf..e86a69c1a7 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.cdt.dsf.gdb.ui;singleton:=true
-Bundle-Version: 2.6.2.qualifier
+Bundle-Version: 2.6.100.qualifier
Bundle-Activator: org.eclipse.cdt.dsf.gdb.internal.ui.GdbUIPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/GdbFullCliConsolePage.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/GdbFullCliConsolePage.java
index 9740bb409d..c10b7fd3c7 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/GdbFullCliConsolePage.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/GdbFullCliConsolePage.java
@@ -120,12 +120,12 @@ public class GdbFullCliConsolePage extends Page implements IDebugContextListener
@Override
public void dispose() {
- super.dispose();
DebugUITools.getDebugContextManager().getContextService(getSite().getWorkbenchWindow())
.removeDebugContextListener(this);
fTerminalControl.disposeTerminal();
fMenuManager.dispose();
GdbUIPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(fPreferenceListener);
+ super.dispose();
}
@Override

Back to the top