---

yihanzhen · web-flow · commit ea3c4fb8c879 · 2018-07-10T16:07:13.000-07:00
yaml --- r: 9863 b: refs/heads/master c: 23fefa1 h: refs/heads/master i: 9861: bbbf986 9859: b7cb75a 9855: c36eb4b
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0325488e9bad8f7f9684eaae843c460b13368de7
+refs/heads/master: 23fefa1a98233a96a89d55f7191a80bc63975a75
 refs/heads/travis: 47e4fee4fd5af9b2a8ce46f23c72ec95f9b195b2
 refs/heads/gh-pages: 8f06ce58a2d2825865991e9ba7841a013dccbae1
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
diff --git a/trunk/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Timestamp.java b/trunk/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Timestamp.java
@@ -78,9 +78,12 @@ public static Timestamp ofTimeSecondsAndNanos(long seconds, int nanos) {
    * @throws IllegalArgumentException if the timestamp is outside the representable range
    */
   public static Timestamp ofTimeMicroseconds(long microseconds) {
-    long seconds = TimeUnit.MICROSECONDS.toSeconds(microseconds);
-    int nanos =
-        (int) TimeUnit.MICROSECONDS.toNanos(microseconds - TimeUnit.SECONDS.toMicros(seconds));
+    long seconds = microseconds / 1_000_000;
+    int nanos = (int)(microseconds % 1_000_000 * 1000);
+    if (nanos < 0) {
+      seconds--;
+      nanos += 1_000_000_000;
+    }
     checkArgument(
         Timestamps.isValid(seconds, nanos), "timestamp out of range: %s, %s", seconds, nanos);
     return new Timestamp(seconds, nanos);
diff --git a/trunk/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/TimestampTest.java b/trunk/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/TimestampTest.java
@@ -39,7 +39,9 @@ public class TimestampTest {
   private static final long TEST_TIME_MICROSECONDS = 10000100L;
   private static final long TEST_TIME_MILLISECONDS =
       TimeUnit.SECONDS.toMillis(1444662894L) + TimeUnit.MICROSECONDS.toMillis(1234);
+  private static final long TEST_TIME_MILLISECONDS_NEGATIVE = -1000L;
   private static final Date TEST_DATE = new Date(TEST_TIME_MILLISECONDS);
+  private static final Date TEST_DATE_PRE_EPOCH = new Date(TEST_TIME_MILLISECONDS_NEGATIVE);
 
   @Rule public ExpectedException expectedException = ExpectedException.none();
 
@@ -80,6 +82,19 @@ public void ofDate() {
     assertThat(timestamp.getNanos()).isEqualTo(expectedNanos);
   }
 
+  @Test
+  public void ofDatePreEpoch() {
+    Timestamp timestamp = Timestamp.of(TEST_DATE_PRE_EPOCH);
+    long expectedSeconds = TEST_TIME_MILLISECONDS_NEGATIVE / 1_000;
+    int expectedNanos = (int)(TEST_TIME_MILLISECONDS_NEGATIVE % 1_000 * 1000_000);
+    if (expectedNanos < 0) {
+      expectedSeconds--;
+      expectedNanos += 1_000_000_000;
+    }
+    assertThat(timestamp.getSeconds()).isEqualTo(expectedSeconds);
+    assertThat(timestamp.getNanos()).isEqualTo(expectedNanos);
+  }
+
   @Test
   public void toDate() {
     Timestamp timestamp = Timestamp.ofTimeSecondsAndNanos(TEST_TIME_SECONDS, 1234 * 1000);
