fix issue alibaba#269

Yako · Yako · commit e53047afcdc9 · 2015-01-13T17:40:17.000+08:00
diff --git a/src/main/java/com/alibaba/fastjson/parser/JSONScanner.java b/src/main/java/com/alibaba/fastjson/parser/JSONScanner.java
@@ -475,6 +475,15 @@ public boolean scanISO8601DateIfMatch(boolean strict) {
                }
            }
            
+        } else if (timeZoneFlag == 'Z') {// UTC
+            timzeZoneLength = 1;
+            if (calendar.getTimeZone().getRawOffset() != 0) {
+                String[] timeZoneIDs = TimeZone.getAvailableIDs(0);
+                if (timeZoneIDs.length > 0) {
+                    TimeZone timeZone = TimeZone.getTimeZone(timeZoneIDs[0]);
+                    calendar.setTimeZone(timeZone);
+                }
+            }
         }
         
         char end = charAt(bp + (20 + millisLen + timzeZoneLength)) ;
diff --git a/src/test/java/com/alibaba/json/bvt/serializer/DateTest_ISO8601_UTCTime.java b/src/test/java/com/alibaba/json/bvt/serializer/DateTest_ISO8601_UTCTime.java
@@ -0,0 +1,35 @@
+package com.alibaba.json.bvt.serializer;
+
+import java.util.Calendar;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.alibaba.fastjson.JSON;
+
+public class DateTest_ISO8601_UTCTime extends TestCase {
+
+    public void test_date() throws Exception {
+        String text = "{\"gmtCreate\":\"2014-10-09T03:07:07.000Z\"}";
+
+        Calendar date = JSON.parseObject(text, VO.class).getGmtCreate();
+        Assert.assertNotNull(date);
+
+        Assert.assertEquals(0, date.getTimeZone().getRawOffset() / (3600 * 1000));
+    }
+
+    public static class VO {
+
+        private Calendar gmtCreate;
+
+        public Calendar getGmtCreate() {
+            return gmtCreate;
+        }
+
+        public void setGmtCreate(Calendar gmtCreate) {
+            this.gmtCreate = gmtCreate;
+        }
+
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -475,6 +475,15 @@ public boolean scanISO8601DateIfMatch(boolean strict) {`
`475`	`475`	`}`
`476`	`476`	`}`
`477`	`477`
	`478`	`+ } else if (timeZoneFlag == 'Z') {// UTC`
	`479`	`+ timzeZoneLength = 1;`
	`480`	`+ if (calendar.getTimeZone().getRawOffset() != 0) {`
	`481`	`+ String[] timeZoneIDs = TimeZone.getAvailableIDs(0);`
	`482`	`+ if (timeZoneIDs.length > 0) {`
	`483`	`+ TimeZone timeZone = TimeZone.getTimeZone(timeZoneIDs[0]);`
	`484`	`+ calendar.setTimeZone(timeZone);`
	`485`	`+ }`
	`486`	`+ }`
`478`	`487`	`}`
`479`	`488`
`480`	`489`	`char end = charAt(bp + (20 + millisLen + timzeZoneLength)) ;`