Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2008-04-18 09:11:32 +0000
committerTomasz Zarna2008-04-18 09:11:32 +0000
commit9bb7a1acbce64e85d18393c3249ce3c41275b32f (patch)
tree155ab1a6dd7dc86fac7de4cd4baf1e4113fbc6c3
parent822c62964e4a18b4560a272f02eaa6dff9a9fadc (diff)
downloadeclipse.platform.team-9bb7a1acbce64e85d18393c3249ce3c41275b32f.tar.gz
eclipse.platform.team-9bb7a1acbce64e85d18393c3249ce3c41275b32f.tar.xz
eclipse.platform.team-9bb7a1acbce64e85d18393c3249ce3c41275b32f.zip
bug 227565: NPE in TeamAction.dispose() on shutdown
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java
index b308dc343..fffc6743e 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java
@@ -432,7 +432,9 @@ public abstract class TeamAction extends AbstractHandler implements IObjectActio
super.dispose();
if(window != null) {
window.getSelectionService().removePostSelectionListener(selectionListener);
- window.getActivePage().removePartListener(targetPartListener);
+ if (window.getActivePage() != null) {
+ window.getActivePage().removePartListener(targetPartListener);
+ }
targetPartListener = null;
}
// Don't hold on to anything when we are disposed to prevent memory leaks (see bug 195521)

Back to the top