Skip to content

Commit c0fe78e

Browse files
fix(spanner): Fix multiplexed session environment variable validation.
1 parent a03d3ea commit c0fe78e

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPoolOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ public boolean getUseMultiplexedSessionForRW() {
360360
@VisibleForTesting
361361
@InternalApi
362362
public boolean getUseMultiplexedSessionPartitionedOps() {
363-
return useMultiplexedSessionForPartitionedOps;
363+
return getUseMultiplexedSession() && useMultiplexedSessionForPartitionedOps;
364364
}
365365

366366
private static Boolean getUseMultiplexedSessionFromEnvVariable() {

google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/AbstractMockServerTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,8 +332,7 @@ boolean isMultiplexedSessionsEnabledForPartitionedOps(Spanner spanner) {
332332
if (spanner.getOptions() == null || spanner.getOptions().getSessionPoolOptions() == null) {
333333
return false;
334334
}
335-
return spanner.getOptions().getSessionPoolOptions().getUseMultiplexedSessionPartitionedOps()
336-
&& spanner.getOptions().getSessionPoolOptions().getUseMultiplexedSession();
335+
return spanner.getOptions().getSessionPoolOptions().getUseMultiplexedSessionPartitionedOps();
337336
}
338337

339338
boolean isMultiplexedSessionsEnabledForRW(Spanner spanner) {

0 commit comments

Comments
 (0)