---

mziccard · mziccard · commit 6c998baafb6d · 2015-10-13T18:18:47.000+02:00
yaml --- r: 1015 b: refs/heads/master c: 6bbfb05 h: refs/heads/master i: 1013: adbdbc1 1011: 7dfcd27 1007: b16e8a3 v: v3
diff --git a/[refs] b/[refs]
@@ -1,4 +1,4 @@
 ---
-refs/heads/master: 3e57ae795e3b3b0388f2515818d727a5e2b4abc9
+refs/heads/master: 6bbfb056baa6e69934b3171f541dec54996c8516
 refs/heads/travis: 0fa997e2fc9c6b61b2d91e6d163655aae67d44b6
 refs/heads/gh-pages: 5a10432ecc75f29812e33a8236c900379509fe99
diff --git a/trunk/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/trunk/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -34,6 +34,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.ObjectStreamException;
 import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.net.HttpURLConnection;
@@ -124,6 +125,10 @@ private static class DefaultClock extends ServiceOptions.Clock implements Serial
       public long millis() {
         return System.currentTimeMillis();
       }
+
+      private Object readResolve() throws ObjectStreamException {
+        return DEFAULT_TIME_SOURCE;
+      }
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@`
`34`	`34`	`import java.io.IOException;`
`35`	`35`	`import java.io.InputStream;`
`36`	`36`	`import java.io.InputStreamReader;`
	`37`	`+import java.io.ObjectStreamException;`
`37`	`38`	`import java.io.Serializable;`
`38`	`39`	`import java.lang.reflect.Method;`
`39`	`40`	`import java.net.HttpURLConnection;`
`@@ -124,6 +125,10 @@ private static class DefaultClock extends ServiceOptions.Clock implements Serial`
`124`	`125`	`public long millis() {`
`125`	`126`	`return System.currentTimeMillis();`
`126`	`127`	`}`
	`128`	`+`
	`129`	`+ private Object readResolve() throws ObjectStreamException {`
	`130`	`+ return DEFAULT_TIME_SOURCE;`
	`131`	`+ }`
`127`	`132`	`}`
`128`	`133`	`}`
`129`	`134`