From df3f97385024a7866497c87f54373aa867c71f42 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 30 Aug 2013 14:04:28 +0000
Subject: [PATCH] Final fix for OPENDJ-1112: LoadBalancing connection factories need better diagnostic messages
---
opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java
index 5abac02..cd99442 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java
@@ -297,17 +297,9 @@
private ScheduledFuture<?> monitoringFuture;
private AtomicBoolean isClosed = new AtomicBoolean();
- AbstractLoadBalancingAlgorithm(final Collection<ConnectionFactory> factories) {
- this(factories, 1, TimeUnit.SECONDS, null);
- }
-
AbstractLoadBalancingAlgorithm(final Collection<ConnectionFactory> factories,
- final long interval, final TimeUnit unit) {
- this(factories, interval, unit, null);
- }
-
- AbstractLoadBalancingAlgorithm(final Collection<ConnectionFactory> factories,
- final long interval, final TimeUnit unit, final ScheduledExecutorService scheduler) {
+ final LoadBalancerEventListener listener, final long interval, final TimeUnit unit,
+ final ScheduledExecutorService scheduler) {
Validator.ensureNotNull(factories, unit);
this.monitoredFactories = new ArrayList<MonitoredConnectionFactory>(factories.size());
@@ -318,7 +310,7 @@
this.scheduler = DEFAULT_SCHEDULER.acquireIfNull(scheduler);
this.monitoringInterval = interval;
this.monitoringIntervalTimeUnit = unit;
- this.listener = DEFAULT_LISTENER;
+ this.listener = listener != null ? listener : DEFAULT_LISTENER;
}
@Override
--
Gitblit v1.10.0