Refactor Broker Properties Mapper to fix Azure#440

justinhughes · May 25, 2015 · 9c3dfc6 · 9c3dfc6
1 parent 10c56b2
commit 9c3dfc6
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/...com/microsoft/windowsazure/services/servicebus/implementation/BrokerPropertiesMapper.java b/...com/microsoft/windowsazure/services/servicebus/implementation/BrokerPropertiesMapper.java
@@ -17,8 +17,10 @@
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Locale;
+import java.util.TimeZone;
 
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.JsonParseException;
@@ -30,9 +32,7 @@ public class BrokerPropertiesMapper {
     public BrokerProperties fromString(String value) {
 
         ObjectMapper mapper = new ObjectMapper();
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(
-                "EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US);
-        mapper.setDateFormat(simpleDateFormat);
+        mapper.setDateFormat(getRFC2616DateFormatter());
         try {
             return mapper.readValue(value.getBytes("UTF-8"),
                     BrokerProperties.class);
@@ -47,9 +47,7 @@ public BrokerProperties fromString(String value) {
 
     public String toString(BrokerProperties value) {
         ObjectMapper mapper = new ObjectMapper();
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(
-                "EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US);
-        mapper.setDateFormat(simpleDateFormat);
+        mapper.setDateFormat(getRFC2616DateFormatter());
         Writer writer = new StringWriter();
         try {
             mapper.writeValue(writer, value);
@@ -62,5 +60,12 @@ public String toString(BrokerProperties value) {
         }
         return writer.toString();
     }
+
+    private DateFormat getRFC2616DateFormatter() {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(
+          "EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US);
+        simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
+        return simpleDateFormat;
+    }
 
 }