NEW - bug 194406: Error while parsing date string "now"

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

4 files changed, 13 insertions, 11 deletions

diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaConfigurationTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaConfigurationTest.java
index 0d547de1a..944396d14 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaConfigurationTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaConfigurationTest.java
@@ -133,7 +133,7 @@ public class BugzillaConfigurationTest extends TestCase {
 		assertTrue(config.getProducts().size() > 50);
 		assertEquals(4, config.getOpenStatusValues().size());
 		assertEquals(13, config.getComponents("Mylyn").size());
-		assertEquals(23, config.getKeywords().size());
+		assertEquals(24, config.getKeywords().size());
 		// assertEquals(10, config.getComponents("Hyades").size());
 		// assertEquals(1, config.getTargetMilestones("TestProduct").size());
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OfflineCachingStorage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OfflineCachingStorage.java
index 61a5165ee..c35a47023 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OfflineCachingStorage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OfflineCachingStorage.java
@@ -115,7 +115,9 @@ public class OfflineCachingStorage implements ITaskDataStorage {
 	public void put(TaskDataState taskDataState) {
 		putReadCache(taskDataState);
 		putWriteCache(taskDataState);
-		cacheFlushJob.requestSave();
+		if (cacheFlushJob != null) {
+			cacheFlushJob.requestSave();
+		}
 	}
 
 	public void remove(String repositoryUrl, String id) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java
index 98db2cef1..7f07884df 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java
@@ -128,7 +128,7 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro
 			repositoryTask = (AbstractTask) element;
 		}
 		if (repositoryTask != null) {
-			if (repositoryTask.getLastReadTimeStamp() == null) {
+			if (repositoryTask.getSynchronizationState() == RepositoryTaskSyncState.INCOMING && repositoryTask.getLastReadTimeStamp() == null) {
 				if (synchViewStyle) {
 					return TasksUiImages.OVERLAY_SYNCH_INCOMMING_NEW;
 				} else {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/RepositorySynchronizationManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/RepositorySynchronizationManager.java
index 9d27da8df..e48e4a926 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/RepositorySynchronizationManager.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/RepositorySynchronizationManager.java
@@ -16,7 +16,6 @@ import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.jobs.IJobChangeListener;
 import org.eclipse.core.runtime.jobs.ISchedulingRule;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.mylyn.internal.tasks.core.LocalTask;
 import org.eclipse.mylyn.internal.tasks.core.TaskDataManager;
 import org.eclipse.mylyn.monitor.core.StatusHandler;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
@@ -288,10 +287,11 @@ public final class RepositorySynchronizationManager {
 				// == null) {
 				dataManager.setOldTaskData(taskData);
 				// }
-			} else if (repositoryTask.getLastReadTimeStamp() == null && repositoryTask.isLocal()) {
-				// fall back for cases where the stamp is missing, set bogus date
-				repositoryTask.setLastReadTimeStamp(LocalTask.SYNC_DATE_NOW);
 			}
+//			else if (repositoryTask.getLastReadTimeStamp() == null && repositoryTask.isLocal()) {
+//				// fall back for cases where the stamp is missing, set bogus date
+//				repositoryTask.setLastReadTimeStamp(LocalTask.SYNC_DATE_NOW);
+//			}
 
 		} else if (!read && repositoryTask.getSynchronizationState().equals(RepositoryTaskSyncState.SYNCHRONIZED)) {
 			repositoryTask.setSynchronizationState(RepositoryTaskSyncState.INCOMING);
@@ -299,9 +299,9 @@ public final class RepositorySynchronizationManager {
 		}
 
 		// for repositories that don't support task data or if no task data is available
-		if (read && taskData == null) {
-			repositoryTask.setLastReadTimeStamp(LocalTask.SYNC_DATE_NOW);
-		}
+		//if (read && taskData == null) {
+		//	repositoryTask.setLastReadTimeStamp(LocalTask.SYNC_DATE_NOW);
+		//}
 	}
 
 	public void discardOutgoing(AbstractTask repositoryTask) {
@@ -328,7 +328,7 @@ public final class RepositorySynchronizationManager {
 			return rule == this;
 		}
 	}
-	
+
 	/*
 	private static class RepositoryMutexRule implements ISchedulingRule {