---

mziccard · mziccard · commit fb4c537c9740 · 2015-11-19T19:11:07.000+01:00
yaml --- r: 1845 b: refs/heads/pubsub-alpha c: 12aa555 h: refs/heads/master i: 1843: 04c8c5e
diff --git a/[refs] b/[refs]
@@ -3,7 +3,7 @@ refs/heads/master: 689bbb466df4b2d5d2483d6edb8ac5c7c7f7c6fa
 refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
 refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
-refs/heads/pubsub-alpha: e3a99c2f9314f938bafd9fd5d19a98a43335bd98
+refs/heads/pubsub-alpha: 12aa55591cde5f0f5b3bbf6e4d29c7d049925c5f
 refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
 refs/heads/update-datastore: 482954f2c5055231e5b3122ea91d2ba00ce8187c
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
diff --git a/branches/pubsub-alpha/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java b/branches/pubsub-alpha/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
@@ -35,6 +35,7 @@
 import com.google.api.services.bigquery.model.Job;
 import com.google.api.services.bigquery.model.JobList;
 import com.google.api.services.bigquery.model.JobReference;
+import com.google.api.services.bigquery.model.JobStatus;
 import com.google.api.services.bigquery.model.QueryRequest;
 import com.google.api.services.bigquery.model.QueryResponse;
 import com.google.api.services.bigquery.model.Table;
@@ -220,8 +221,9 @@ public Tuple<String, Iterable<Table>> listTables(String datasetId, Map<Option, ?
           .setMaxResults(MAX_RESULTS.getLong(options))
           .setPageToken(PAGE_TOKEN.getString(options))
           .execute();
+      Iterable<TableList.Tables> tables = tableList.getTables();
       return Tuple.of(tableList.getNextPageToken(),
-          Iterables.transform(tableList.getTables(),
+          Iterables.transform(tables != null ? tables : ImmutableList.<TableList.Tables>of(),
               new Function<TableList.Tables, Table>() {
                 @Override
                 public Table apply(TableList.Tables f) {
@@ -350,11 +352,19 @@ public Tuple<String, Iterable<Job>> listJobs(Map<Option, ?> options) throws BigQ
           .setPageToken(PAGE_TOKEN.getString(options))
           .setProjection(DEFAULT_PROJECTION)
           .execute();
+      Iterable<JobList.Jobs> jobs = jobsList.getJobs();
       return Tuple.of(jobsList.getNextPageToken(),
-          Iterables.transform(jobsList.getJobs(),
+          Iterables.transform(jobs != null ? jobs : ImmutableList.<JobList.Jobs>of(),
               new Function<JobList.Jobs, Job>() {
                 @Override
                 public Job apply(JobList.Jobs f) {
+                  JobStatus statusPb = f.getStatus() != null ? f.getStatus() : new JobStatus();
+                  if (statusPb.getState() == null) {
+                    statusPb.setState(f.getState());
+                  }
+                  if (statusPb.getErrorResult() == null) {
+                    statusPb.setErrorResult(f.getErrorResult());
+                  }
                   return new Job()
                       .setConfiguration(f.getConfiguration())
                       .setId(f.getId())
