---

ajaaym · chingor13 · commit 25987f5ac8bf · 2018-11-19T14:11:04.000-08:00
yaml --- r: 11679 b: refs/heads/autosynth-pubsub c: de19e9f h: refs/heads/master i: 11677: 71de427 11675: 50a3202 11671: c0275a7 11663: d74bfb6 11647: fb83105
diff --git a/[refs] b/[refs]
@@ -116,7 +116,7 @@ refs/heads/autosynth-compute: fa508ebab5b6a1db14949441c8de868cefbcf1a6
 refs/heads/autosynth-container: d0346e84b1f26e3dc10444450a998f357a43bcef
 refs/heads/autosynth-dataproc: c0f21dd811166848a60f810565a5614bb9c7f47e
 refs/heads/autosynth-monitoring: 28bf7ca67c0aab4815884e5d6253aaa8aa3baa1c
-refs/heads/autosynth-pubsub: dc0a1ae5c4d401dc11b9f74ebd70381e38437ed8
+refs/heads/autosynth-pubsub: de19e9fd1f071bd7688832ec6bb7d0886c1ca2e6
 refs/heads/autosynth-video-intelligence: 06fb1841ae847f4ef79a62ba995efbabc213edf8
 refs/heads/autosynth-vision: 6bece1ee6c1c41d5822c72bf0d6a82484166b402
 refs/heads/spanner: 54a5e197bfe0a004e13c190427f46c3413ab572d
diff --git a/branches/autosynth-pubsub/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/StandardTableDefinition.java b/branches/autosynth-pubsub/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/StandardTableDefinition.java
@@ -46,11 +46,11 @@ public abstract class StandardTableDefinition extends TableDefinition {
   public static class StreamingBuffer implements Serializable {
 
     private static final long serialVersionUID = 822027055549277843L;
-    private final long estimatedRows;
-    private final long estimatedBytes;
+    private final Long estimatedRows;
+    private final Long estimatedBytes;
     private final Long oldestEntryTime;
 
-    StreamingBuffer(long estimatedRows, long estimatedBytes, Long oldestEntryTime) {
+    StreamingBuffer(Long estimatedRows, Long estimatedBytes, Long oldestEntryTime) {
       this.estimatedRows = estimatedRows;
       this.estimatedBytes = estimatedBytes;
       this.oldestEntryTime = oldestEntryTime;
@@ -113,8 +113,13 @@ static StreamingBuffer fromPb(Streamingbuffer streamingBufferPb) {
       if (streamingBufferPb.getOldestEntryTime() != null) {
         oldestEntryTime = streamingBufferPb.getOldestEntryTime().longValue();
       }
-      return new StreamingBuffer(streamingBufferPb.getEstimatedRows().longValue(),
-          streamingBufferPb.getEstimatedBytes().longValue(),
+      return new StreamingBuffer(
+          streamingBufferPb.getEstimatedRows() != null
+              ? streamingBufferPb.getEstimatedRows().longValue()
+              : null,
+          streamingBufferPb.getEstimatedBytes() != null
+              ? streamingBufferPb.getEstimatedBytes().longValue()
+              : null,
           oldestEntryTime);
     }
   }
diff --git a/branches/autosynth-pubsub/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/StandardTableDefinitionTest.java b/branches/autosynth-pubsub/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/StandardTableDefinitionTest.java
@@ -20,6 +20,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import com.google.api.services.bigquery.model.Streamingbuffer;
 import com.google.cloud.bigquery.StandardTableDefinition.StreamingBuffer;
 
 import com.google.common.collect.ImmutableList;
@@ -117,6 +118,12 @@ public void testToAndFromPb() {
         TableDefinition.<StandardTableDefinition>fromPb(definition.toPb()));
   }
 
+  @Test
+  public void testFromPbWithNullEstimatedRowsAndBytes() {
+    StandardTableDefinition.fromPb(
+        TABLE_DEFINITION.toPb().setStreamingBuffer(new Streamingbuffer()));
+  }
+
   private void compareStandardTableDefinition(StandardTableDefinition expected,
       StandardTableDefinition value) {
     assertEquals(expected, value);
