chore: merge main into generate-libraries-main

cloud-java-bot · cloud-java-bot · commit 0105389eaf0e · 2026-02-07T02:52:20.000Z
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClient.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClient.java
@@ -562,7 +562,7 @@ final class MultiplexedSessionMaintainer {
       this.clock = clock;
     }
 
-    void start() {
+    private synchronized void start() {
       // Schedule the maintainer to run once every ten minutes (by default).
       long loopFrequencyMillis =
           MultiplexedSessionDatabaseClient.this
@@ -577,7 +577,7 @@ void start() {
               this::maintain, loopFrequencyMillis, loopFrequencyMillis, TimeUnit.MILLISECONDS);
     }
 
-    void stop() {
+    private synchronized void stop() {
       if (this.scheduledFuture != null) {
         this.scheduledFuture.cancel(false);
       }

Original file line number	Diff line number	Diff line change
`@@ -562,7 +562,7 @@ final class MultiplexedSessionMaintainer {`
`562`	`562`	`this.clock = clock;`
`563`	`563`	`}`
`564`	`564`
`565`		`- void start() {`
	`565`	`+ private synchronized void start() {`
`566`	`566`	`// Schedule the maintainer to run once every ten minutes (by default).`
`567`	`567`	`long loopFrequencyMillis =`
`568`	`568`	`MultiplexedSessionDatabaseClient.this`
`@@ -577,7 +577,7 @@ void start() {`
`577`	`577`	`this::maintain, loopFrequencyMillis, loopFrequencyMillis, TimeUnit.MILLISECONDS);`
`578`	`578`	`}`
`579`	`579`
`580`		`- void stop() {`
	`580`	`+ private synchronized void stop() {`
`581`	`581`	`if (this.scheduledFuture != null) {`
`582`	`582`	`this.scheduledFuture.cancel(false);`
`583`	`583`	`}`