This is an automated email from the ASF dual-hosted git repository.
absurdfarce pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/cassandra-java-driver.git
The following commit(s) were added to refs/heads/4.x by this push:
new 07265b4a6 Initial fix to unit tests
07265b4a6 is described below
commit 07265b4a6830a47752bf31eb4f631b9917863da2
Author: absurdfarce <bret.mcgu...@datastax.com>
AuthorDate: Tue Apr 23 00:38:48 2024 -0500
Initial fix to unit tests
patch by Bret McGuire; reviewed by Bret McGuire for PR 1930
---
.../oss/driver/internal/core/session/DefaultSession.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git
a/core/src/main/java/com/datastax/oss/driver/internal/core/session/DefaultSession.java
b/core/src/main/java/com/datastax/oss/driver/internal/core/session/DefaultSession.java
index cb1271c9c..6f063ae9a 100644
---
a/core/src/main/java/com/datastax/oss/driver/internal/core/session/DefaultSession.java
+++
b/core/src/main/java/com/datastax/oss/driver/internal/core/session/DefaultSession.java
@@ -39,6 +39,7 @@ import
com.datastax.oss.driver.internal.core.metadata.MetadataManager;
import
com.datastax.oss.driver.internal.core.metadata.MetadataManager.RefreshSchemaResult;
import com.datastax.oss.driver.internal.core.metadata.NodeStateEvent;
import com.datastax.oss.driver.internal.core.metadata.NodeStateManager;
+import com.datastax.oss.driver.internal.core.metrics.NodeMetricUpdater;
import com.datastax.oss.driver.internal.core.metrics.SessionMetricUpdater;
import com.datastax.oss.driver.internal.core.pool.ChannelPool;
import com.datastax.oss.driver.internal.core.util.Loggers;
@@ -549,10 +550,11 @@ public class DefaultSession implements CqlSession {
// clear metrics to prevent memory leak
for (Node n : metadataManager.getMetadata().getNodes().values()) {
- ((DefaultNode) n).getMetricUpdater().clearMetrics();
+ NodeMetricUpdater updater = ((DefaultNode) n).getMetricUpdater();
+ if (updater != null) updater.clearMetrics();
}
- DefaultSession.this.metricUpdater.clearMetrics();
+ if (metricUpdater != null) metricUpdater.clearMetrics();
List<CompletionStage<Void>> childrenCloseStages = new ArrayList<>();
for (AsyncAutoCloseable closeable : internalComponentsToClose()) {
@@ -575,10 +577,11 @@ public class DefaultSession implements CqlSession {
// clear metrics to prevent memory leak
for (Node n : metadataManager.getMetadata().getNodes().values()) {
- ((DefaultNode) n).getMetricUpdater().clearMetrics();
+ NodeMetricUpdater updater = ((DefaultNode) n).getMetricUpdater();
+ if (updater != null) updater.clearMetrics();
}
- DefaultSession.this.metricUpdater.clearMetrics();
+ if (metricUpdater != null) metricUpdater.clearMetrics();
if (closeWasCalled) {
// onChildrenClosed has already been scheduled
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
