Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2011-09-14 16:45:59 -0400
committerSteffen Pingel2011-09-14 16:45:59 -0400
commit6d8a2fc7c721e548710f2b05e6b1ce818efac316 (patch)
tree389ee6d036c9c71015a87ef1e0f0b386c7f0ecd9
parent7515894199deceb208b8d2f7d5807ca4c8f7cadd (diff)
downloadorg.eclipse.mylyn.tasks-6d8a2fc7c721e548710f2b05e6b1ce818efac316.tar.gz
org.eclipse.mylyn.tasks-6d8a2fc7c721e548710f2b05e6b1ce818efac316.tar.xz
org.eclipse.mylyn.tasks-6d8a2fc7c721e548710f2b05e6b1ce818efac316.zip
NEW - bug 357541: NPE thrown when trying to open a task and cancelling
out of a new task operation https://bugs.eclipse.org/bugs/show_bug.cgi?id=357541
-rw-r--r--org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/KeywordParser.java7
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskAction.java17
2 files changed, 9 insertions, 15 deletions
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/KeywordParser.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/KeywordParser.java
deleted file mode 100644
index 1f542b723..000000000
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/KeywordParser.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskAction.java
index 81d17e31f..449786bae 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskAction.java
@@ -46,14 +46,15 @@ public class OpenTaskAction extends ActionDelegate implements IWorkbenchWindowAc
if (dlg.open() != Window.OK) {
return;
}
-
- for (Object result : dlg.getResult()) {
- if (result instanceof ITask) {
- AbstractTask task = (AbstractTask) result;
- if (dlg.getOpenInBrowser()) {
- TasksUiUtil.openWithBrowser(task);
- } else {
- TasksUiInternal.refreshAndOpenTaskListElement(task);
+ if (dlg.getResult() != null) {
+ for (Object result : dlg.getResult()) {
+ if (result instanceof ITask) {
+ AbstractTask task = (AbstractTask) result;
+ if (dlg.getOpenInBrowser()) {
+ TasksUiUtil.openWithBrowser(task);
+ } else {
+ TasksUiInternal.refreshAndOpenTaskListElement(task);
+ }
}
}
}

Back to the top