NEW - bug 238043: SynchronizationSession.getStaleTasks() should return empty set

https://bugs.eclipse.org/bugs/show_bug.cgi?id=238043

2 files changed, 9 insertions, 6 deletions

diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizationSession.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizationSession.java
index feeb2164b..822127717 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizationSession.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizationSession.java
@@ -11,6 +11,7 @@
 
 package org.eclipse.mylyn.internal.tasks.core.sync;
 
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -64,7 +65,11 @@ public class SynchronizationSession implements ISynchronizationSession {
 	}
 
 	public Set<ITask> getStaleTasks() {
-		return staleTasks;
+		if (staleTasks == null) {
+			return Collections.emptySet();
+		} else {
+			return staleTasks;
+		}
 	}
 
 	public IStatus getStatus() {
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeQueriesJob.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeQueriesJob.java
index 11d531ca6..7827423c9 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeQueriesJob.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeQueriesJob.java
@@ -208,11 +208,9 @@ public class SynchronizeQueriesJob extends SynchronizationJob {
 				}
 
 				Set<ITask> tasksToBeSynchronized = new HashSet<ITask>();
-				if (session.getStaleTasks() != null) {
-					for (ITask task : session.getStaleTasks()) {
-						tasksToBeSynchronized.add(task);
-						((AbstractTask) task).setSynchronizing(true);
-					}
+				for (ITask task : session.getStaleTasks()) {
+					tasksToBeSynchronized.add(task);
+					((AbstractTask) task).setSynchronizing(true);
 				}
 
 				// synchronize tasks that were marked by the connector