googleapis
diff --git a/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/AbstractBaseUnitOfWork.java‎
Lines changed: 15 additions & 3 deletions b/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/AbstractBaseUnitOfWork.java‎
Lines changed: 15 additions & 3 deletions
diff --git a/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/AbstractMultiUseTransaction.java‎
Lines changed: 6 additions & 3 deletions b/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/AbstractMultiUseTransaction.java‎
Lines changed: 6 additions & 3 deletions
@@ -177,10 +177,12 @@ public void cancel() {
   }
 
   <T> ApiFuture<T> executeStatementAsync(
+      CallType callType,
       ParsedStatement statement,
       Callable<T> callable,
       @Nullable MethodDescriptor<?, ?> applyStatementTimeoutToMethod) {
     return executeStatementAsync(
+        callType,
         statement,
         callable,
         InterceptorsUsage.INVOKE_INTERCEPTORS,
@@ -190,11 +192,16 @@ <T> ApiFuture<T> executeStatementAsync(
   }
 
   <T> ApiFuture<T> executeStatementAsync(
+      CallType callType,
       ParsedStatement statement,
       Callable<T> callable,
       Collection<MethodDescriptor<?, ?>> applyStatementTimeoutToMethods) {
     return executeStatementAsync(
-        statement, callable, InterceptorsUsage.INVOKE_INTERCEPTORS, applyStatementTimeoutToMethods);
+        callType,
+        statement,
+        callable,
+        InterceptorsUsage.INVOKE_INTERCEPTORS,
+        applyStatementTimeoutToMethods);
   }
 
   <ResponseT, MetadataT> ResponseT getWithStatementTimeout(
@@ -237,6 +244,7 @@ <ResponseT, MetadataT> ResponseT getWithStatementTimeout(
   }
 
   <T> ApiFuture<T> executeStatementAsync(
+      CallType callType,
       ParsedStatement statement,
       Callable<T> callable,
       InterceptorsUsage interceptorUsage,
@@ -268,13 +276,17 @@ public <ReqT, RespT> ApiCallContext configure(
     }
     ApiFuture<T> f = statementExecutor.submit(context.wrap(callable));
     final SpannerAsyncExecutionException caller =
-        new SpannerAsyncExecutionException(statement.getStatement());
+        callType == CallType.ASYNC
+            ? new SpannerAsyncExecutionException(statement.getStatement())
+            : null;
     final ApiFuture<T> future =
         ApiFutures.catching(
             f,
             Throwable.class,
             input -> {
-              input.addSuppressed(caller);
+              if (caller != null) {
+                input.addSuppressed(caller);
+              }
               throw SpannerExceptionFactory.asSpannerException(input);
             },
             MoreExecutors.directExecutor());
 
@@ -102,18 +102,21 @@ public boolean isActive() {
    * Check that the current transaction actually has a valid underlying transaction. If not, the
    * method will throw a {@link SpannerException}.
    */
-  abstract void checkValidTransaction();
+  abstract void checkValidTransaction(CallType callType);
 
   /** Returns the {@link ReadContext} that can be used for queries on this transaction. */
   abstract ReadContext getReadContext();
 
+  @Override
   public ApiFuture<ResultSet> executeQueryAsync(
+      final CallType callType,
       final ParsedStatement statement,
       final AnalyzeMode analyzeMode,
       final QueryOption... options) {
     Preconditions.checkArgument(statement.isQuery(), "Statement is not a query");
-    checkValidTransaction();
+    checkValidTransaction(callType);
     return executeStatementAsync(
+        callType,
         statement,
         () -> {
           checkAborted();
@@ -133,7 +136,7 @@ ResultSet internalExecuteQuery(
   }
 
   @Override
-  public ApiFuture<long[]> runBatchAsync() {
+  public ApiFuture<long[]> runBatchAsync(CallType callType) {
     throw SpannerExceptionFactory.newSpannerException(
         ErrorCode.FAILED_PRECONDITION, "Run batch is not supported for transactions");
   }