310545: persist query time stamp in server time

Change-Id: Id38a06c74ab09a2ce543feaba33d0c55e9c4d9d7
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=310545

1 files changed, 9 insertions, 6 deletions

diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java
index 6f0afcd..5679561 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java
@@ -80,7 +80,7 @@ public class BugzillaRepositoryConnector extends AbstractRepositoryConnector {
 
 	//private static final String DEADLINE_FORMAT = "yyyy-MM-dd"; //$NON-NLS-1$
 
-	private static final String TIMESTAMP_WITH_OFFSET = "yyyy-MM-dd HH:mm:ss Z"; //$NON-NLS-1$
+	//private static final String TIMESTAMP_WITH_OFFSET = "yyyy-MM-dd HH:mm:ss Z"; //$NON-NLS-1$
 
 	private static final long HOUR = 1000 * 60 * 60;
 
@@ -360,11 +360,14 @@ public class BugzillaRepositoryConnector extends AbstractRepositoryConnector {
 		}
 
 		if (syncSession.getData() == null && collector.getQueryTimestamp() != null) {
-			Date queryDate = BugzillaAttributeMapper.parseDate(collector.getQueryTimestamp());
-			if (queryDate != null) {
-				// Ensure time is in right format
-				syncSession.setData(new SimpleDateFormat(TIMESTAMP_WITH_OFFSET).format(queryDate));
-			}
+			// Bugzilla 4.2 does not parse the timezone of the time stamp properly hence it needs to be persisted in 
+			// server time and not local time
+			syncSession.setData(collector.getQueryTimestamp());
+//			Date queryDate = BugzillaAttributeMapper.parseDate(collector.getQueryTimestamp());
+//			if (queryDate != null) {
+//				// Ensure time is in right format
+//				syncSession.setData(new SimpleDateFormat(TIMESTAMP_WITH_OFFSET).format(queryDate));
+//			}
 		}
 	}