Corrected $date parsing of Long values

Author: breinero-zz

src/main/com/mongodb/util/JSONCallback.java

@@ -20,6 +20,7 @@
 
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.SimpleTimeZone;
 import java.util.UUID;
@@ -76,13 +77,21 @@ public Object objectDone(){
 		    new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
                 GregorianCalendar calendar = new GregorianCalendar(new SimpleTimeZone(0, "GMT"));
                 format.setCalendar(calendar);
-                String txtdate = (String) b.get("$date");
-                o = format.parse(txtdate, new ParsePosition(0));
-                if (o == null) {
-                    // try older format with no ms
-                    format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-                    format.setCalendar(calendar);
+
+                String txtdate = b.get("$date").toString();
+
+                try {
+                    // Convert from seconds to ms to match consistency 
+                    // with strict JSON serialization
+                    o = new Date(  Long.parseLong(txtdate) * 1000l);
+                } catch (NumberFormatException e) {
                     o = format.parse(txtdate, new ParsePosition(0));
+                    if (o == null) {
+                        // try older format with no ms
+                        format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+                        format.setCalendar(calendar);
+                        o = format.parse(txtdate, new ParsePosition(0));
+                    }
                 }
 		if (!isStackEmpty()) {
 		    cur().put( name, o );

src/test/com/mongodb/util/JSONCallbackTest.java

@@ -0,0 +1,30 @@
+package com.mongodb.util;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.SimpleTimeZone;
+
+public class JSONCallbackTest extends com.mongodb.util.TestCase {
+    
+    @org.testng.annotations.Test(groups = {"basic"})
+    public void dateParsing(){
+        long currentTime = System.currentTimeMillis();
+        Date rightNow = new Date();
+        rightNow.setTime(currentTime);
+        
+        SimpleDateFormat format =
+                new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+        format.setCalendar(new GregorianCalendar(new SimpleTimeZone(0, "GMT")));
+        
+        Date parsedDate = (Date)JSON.parse("{ \"$date\" : "+rightNow.getTime()/1000l+"}");
+        assertEquals(format.format(rightNow), format.format(parsedDate));
+        
+        parsedDate = (Date)JSON.parse("{ \"$date\" : \""+rightNow.getTime()/1000l+"\"}");
+        assertEquals(format.format(rightNow), format.format(parsedDate));
+        
+        parsedDate = (Date)JSON.parse("{ \"$date\" : \""+format.format(rightNow)+"\"}");
+        assertEquals(format.format(rightNow), format.format(parsedDate));
+    }
+
+}