Merge branch 'master' of github.com:ServiceStack/ServiceStack.Java

Layoric · Layoric · commit 5264a8ab1207 · 2015-08-07T10:30:13.000+10:00
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Utils.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Utils.java
@@ -210,7 +210,8 @@ public static Date parseDate(String string) {
 
         if (str.startsWith(wcfJsonPrefix)) {
             String body = splitOnLast(splitOnFirst(str, '(')[1], ')')[0];
-            String unixTimeStr = splitOnFirst(body.replace('+', '-'), '-', 1)[0];
+            String unixTimeStr = splitOnFirst(body,'-', 1)[0];
+            unixTimeStr = splitOnFirst(unixTimeStr,'+', 1)[0];
             long unixTime = Long.parseLong(unixTimeStr);
             return new Date(unixTime);
         }

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,8 @@ public static Date parseDate(String string) {`
`210`	`210`
`211`	`211`	`if (str.startsWith(wcfJsonPrefix)) {`
`212`	`212`	`String body = splitOnLast(splitOnFirst(str, '(')[1], ')')[0];`
`213`		`- String unixTimeStr = splitOnFirst(body.replace('+', '-'), '-', 1)[0];`
	`213`	`+ String unixTimeStr = splitOnFirst(body,'-', 1)[0];`
	`214`	`+ unixTimeStr = splitOnFirst(unixTimeStr,'+', 1)[0];`
`214`	`215`	`long unixTime = Long.parseLong(unixTimeStr);`
`215`	`216`	`return new Date(unixTime);`
`216`	`217`	`}`