summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2013-04-25 07:36:51 (EDT)
committerSteffen Pingel2013-04-25 07:36:51 (EDT)
commitceede267ee5fd8f9c04cf5c81de562817b88a2f3 (patch)
tree470b4a1213c6b66d0f6388dafe76c7fef56a305a
parenta013a402c5395b509691a52cc6ee9c9bb559cdf6 (diff)
downloadorg.eclipse.mylyn.commons-ceede267ee5fd8f9c04cf5c81de562817b88a2f3.zip
org.eclipse.mylyn.commons-ceede267ee5fd8f9c04cf5c81de562817b88a2f3.tar.gz
org.eclipse.mylyn.commons-ceede267ee5fd8f9c04cf5c81de562817b88a2f3.tar.bz2
392346: NPE in ActivityContextManagerrefs/changes/80/12180/1
Change-Id: I0d16ad22845aa48518110b044750a39c8a0f63fe Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=392346
-rw-r--r--org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ActivityContextManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ActivityContextManager.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ActivityContextManager.java
index 8b9b815..5b202f7 100644
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ActivityContextManager.java
+++ b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ActivityContextManager.java
@@ -148,7 +148,8 @@ public class ActivityContextManager implements IActivityContextManager {
}
// if the platform is shutting down the workbench manager has already been disposed
// and removing the listener would trigger loading of working sets again
- if (PlatformUI.isWorkbenchRunning()) {
+ // the working set manager null check is required on Eclipse 4.3
+ if (PlatformUI.isWorkbenchRunning() && PlatformUI.getWorkbench().getWorkingSetManager() != null) {
PlatformUI.getWorkbench().getWorkingSetManager().removePropertyChangeListener(WORKING_SET_CHANGE_LISTENER);
}
}