---

Praful Makani · sduskis · commit 924d0c31a6dd · 2019-04-25T15:18:21.000-04:00
yaml --- r: 33443 b: refs/heads/autosynth-os-login c: 264643d h: refs/heads/master i: 33441: 8c71a26 33439: 3e5eb1e
diff --git a/[refs] b/[refs]
@@ -134,7 +134,7 @@ refs/heads/autosynth-firestore: e79eeb26930dfae4439424ad2fda5874eeca54c8
 refs/heads/autosynth-iot: 044be280805a59e06d09658688c9ee474a9815ad
 refs/heads/autosynth-kms: d31449d6621a50fb16a4bef4f30f0f3051d27d7c
 refs/heads/autosynth-language: 6130869312f99a1e7d3aa0485759172a23333cc5
-refs/heads/autosynth-os-login: 3ec7a6f3bae9be9b51e69e605982adbbec66b119
+refs/heads/autosynth-os-login: 264643df7bcc715efbd648c3ab40389ae2253d19
 refs/heads/autosynth-redis: 6bedce4d7c7c6ca6a22e83ad1780e08fdc565a9e
 refs/heads/autosynth-scheduler: 57f9fdb1e7de30c85f4ec7198931a07f50603e55
 refs/heads/autosynth-spanner: de02ca32edea133b68b51052e325359a3704b5d2
diff --git a/branches/autosynth-os-login/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java b/branches/autosynth-os-login/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
@@ -655,9 +655,9 @@ private static Tuple<? extends Page<FieldValueList>, Long> listTableData(
     try {
       final TableId completeTableId =
           tableId.setProjectId(
-              Strings.isNullOrEmpty(serviceOptions.getProjectId())
-                  ? tableId.getProject()
-                  : serviceOptions.getProjectId());
+              Strings.isNullOrEmpty(tableId.getProject())
+                  ? serviceOptions.getProjectId()
+                  : tableId.getProject());
       TableDataList result =
           runWithRetries(
               new Callable<TableDataList>() {
diff --git a/branches/autosynth-os-login/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java b/branches/autosynth-os-login/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java
@@ -1246,8 +1246,7 @@ public void testListTableDataFromTableIdWithProject() {
     EasyMock.expect(bigqueryRpcMock.listTableData(OTHER_PROJECT, DATASET, TABLE, EMPTY_RPC_OPTIONS))
         .andReturn(TABLE_DATA_PB);
     EasyMock.replay(bigqueryRpcMock);
-    BigQueryOptions bigQueryOptions =
-        createBigQueryOptionsForProject(OTHER_PROJECT, rpcFactoryMock);
+    BigQueryOptions bigQueryOptions = createBigQueryOptionsForProject(PROJECT, rpcFactoryMock);
     bigquery = bigQueryOptions.getService();
     Page<FieldValueList> page = bigquery.listTableData(tableId);
     assertEquals(CURSOR, page.getNextPageToken());
