---

sduskis · sduskis · commit 206887e669c6 · 2019-05-01T14:11:44.000-04:00
yaml --- r: 28277 b: refs/heads/pubsub-ordering-keys c: 92a7bf4 h: refs/heads/master i: 28275: a4f5829
diff --git a/[refs] b/[refs]
@@ -155,7 +155,7 @@ refs/tags/v0.72.0: a7703f2593ba312c0b2dde6fdfd4f5c764bb55ac
 refs/tags/v0.73.0: 21241ea8be9439cc5764c4944cdce21d34ce4f9e
 refs/tags/v0.74.0: 9d1f733dbbf790de7b494418523b69c4a9a57638
 refs/heads/ignoretest: 23c412ae07af3d0ab1caa2d44d5bc5c0ccb8b31d
-refs/heads/pubsub-ordering-keys: 142196cae7583aa38142f86aa3830faaf43925fb
+refs/heads/pubsub-ordering-keys: 92a7bf4760df78e7379b6ef3599374650a3d48e3
 refs/tags/v0.75.0: c3673089ae09a897c1b4cf7dfe167fe4f8ab32fb
 refs/tags/v0.76.0: 395b016826d3ddf9cb8b34919636df15a4dbd032
 refs/tags/v0.77.0: 28a85a77883ccf5d48f297fd0ef3b3dca6ce01f0
diff --git a/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java b/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java
@@ -220,7 +220,7 @@ public ApiFuture<String> publish(PubsubMessage message) {
 
     final String orderingKey = message.getOrderingKey();
     Preconditions.checkState(
-        orderingKey != null && !orderingKey.isEmpty() && !enableMessageOrdering,
+        orderingKey.isEmpty() || enableMessageOrdering,
         "Cannot publish a message with an ordering key when message ordering is not enabled.");
 
     final OutstandingPublish outstandingPublish =
@@ -357,7 +357,7 @@ private void publishOutstandingBatch(final OutstandingBatch outstandingBatch) {
           @Override
           public void onSuccess(PublishResponse result) {
             try {
-              if (result.getMessageIdsCount() != outstandingBatch.size()) {
+              if (result == null || result.getMessageIdsCount() != outstandingBatch.size()) {
                 outstandingBatch.onFailure(
                     new IllegalStateException(
                         String.format(
@@ -387,15 +387,15 @@ public void onFailure(Throwable t) {
       ApiFutures.addCallback(publishCall(outstandingBatch), futureCallback, directExecutor());
     } else {
       // If ordering key is specified, publish the batch using the sequential executor.
-      sequentialExecutor.submit(
-          outstandingBatch.orderingKey,
-          new Callable<ApiFuture<PublishResponse>>() {
-            public ApiFuture<PublishResponse> call() {
-              ApiFuture<PublishResponse> future = publishCall(outstandingBatch);
-              ApiFutures.addCallback(future, futureCallback, directExecutor());
-              return future;
-            }
-          });
+      ApiFuture<PublishResponse> future =
+          sequentialExecutor.submit(
+              outstandingBatch.orderingKey,
+              new Callable<ApiFuture<PublishResponse>>() {
+                public ApiFuture<PublishResponse> call() {
+                  return publishCall(outstandingBatch);
+                }
+              });
+      ApiFutures.addCallback(future, futureCallback, directExecutor());
     }
   }
 
