summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2012-07-18 07:24:46 (EDT)
committer Steffen Pingel2012-07-18 07:26:54 (EDT)
commite8c5f18ea257d2702a14933df8c36ef15352ce88 (patch)
tree65a691469a7ec6f05b76d3536d4e44db8e6af170
parent63a244dd88588ec886e70e5de1aee5dec18449ea (diff)
downloadorg.eclipse.mylyn.commons-e8c5f18ea257d2702a14933df8c36ef15352ce88.zip
org.eclipse.mylyn.commons-e8c5f18ea257d2702a14933df8c36ef15352ce88.tar.gz
org.eclipse.mylyn.commons-e8c5f18ea257d2702a14933df8c36ef15352ce88.tar.bz2
NEW - bug 383766: jdt.ui.tests.refactoring trigger NPE in
ActivityContextManager https://bugs.eclipse.org/bugs/show_bug.cgi?id=383766 Change-Id: I576bcd7bcc47e6bb1fb805d8e0f9651b0dbf4e4e
-rw-r--r--org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ActivityContextManager.java4
1 files changed, 3 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 80ea9e2..8b9b815 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
@@ -106,7 +106,9 @@ public class ActivityContextManager implements IActivityContextManager {
IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
if (window != null) {
IWorkbenchPage page = window.getActivePage();
- workingSets = page.getWorkingSets();
+ if (page != null) {
+ workingSets = page.getWorkingSets();
+ }
}
}
});