summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2012-07-18 07:24:46 (EDT)
committerSteffen Pingel2012-07-18 07:24:46 (EDT)
commit4fffaa87829e0280b5f9b916284145b8a16ad919 (patch)
tree9f16905601ac2edfeb1b29d44775c4a0729487c8
parent007da906f3c7bd095bbf6d53f966a5773db5c8aa (diff)
downloadorg.eclipse.mylyn.commons-4fffaa87829e0280b5f9b916284145b8a16ad919.zip
org.eclipse.mylyn.commons-4fffaa87829e0280b5f9b916284145b8a16ad919.tar.gz
org.eclipse.mylyn.commons-4fffaa87829e0280b5f9b916284145b8a16ad919.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();
+ }
}
}
});