Merge branch 'main' into PR #2663 to update

lqiu96 · lqiu96 · commit ddef1442664f · 2026-04-02T05:04:21.000Z
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/exporter/BigtableCloudMonitoringExporter.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/exporter/BigtableCloudMonitoringExporter.java
@@ -194,7 +194,7 @@ public void onFailure(Throwable throwable) {
               RuntimeException asyncWrapper = new RuntimeException("export failed", throwable);
               asyncWrapper.setStackTrace(stackTrace);
 
-              if (state.get() != State.Closing || state.get() != State.Closed) {
+              if (state.get() != State.Closing && state.get() != State.Closed) {
                 // ignore the export warning when client is shutting down
                 LOGGER.log(Level.WARNING, msg, asyncWrapper);
               }

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ public void onFailure(Throwable throwable) {`
`194`	`194`	`RuntimeException asyncWrapper = new RuntimeException("export failed", throwable);`
`195`	`195`	`asyncWrapper.setStackTrace(stackTrace);`
`196`	`196`
`197`		`- if (state.get() != State.Closing \|\| state.get() != State.Closed) {`
	`197`	`+ if (state.get() != State.Closing && state.get() != State.Closed) {`
`198`	`198`	`// ignore the export warning when client is shutting down`
`199`	`199`	`LOGGER.log(Level.WARNING, msg, asyncWrapper);`
`200`	`200`	`}`