From 288851e601ed14742b0ba0bfbc54a2846c2017b4 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 16 Dec 2009 22:56:49 +0000
Subject: [PATCH] Consolidate various utility factories into Connections class.
---
sdk/src/org/opends/sdk/HeartBeatConnectionFactory.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/sdk/src/org/opends/sdk/HeartBeatConnectionFactory.java b/sdk/src/org/opends/sdk/HeartBeatConnectionFactory.java
index d917444..285633c 100644
--- a/sdk/src/org/opends/sdk/HeartBeatConnectionFactory.java
+++ b/sdk/src/org/opends/sdk/HeartBeatConnectionFactory.java
@@ -32,13 +32,13 @@
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import org.opends.sdk.requests.*;
import org.opends.sdk.responses.*;
import org.opends.sdk.schema.Schema;
import com.sun.opends.sdk.util.FutureResultTransformer;
-import com.sun.opends.sdk.util.Validator;
@@ -46,12 +46,12 @@
* An heart beat connection factory can be used to create connections
* that sends a periodic search request to a Directory Server.
*/
-public class HeartBeatConnectionFactory extends
+final class HeartBeatConnectionFactory extends
AbstractConnectionFactory<AsynchronousConnection>
{
private final SearchRequest heartBeat;
- private final int interval;
+ private final long interval;
private final List<AsynchronousConnectionImpl> activeConnections;
@@ -63,8 +63,6 @@
// FIXME: use a single global scheduler?
- // FIXME: change timeout parameters to long+TimeUnit.
-
/**
* Creates a new heart-beat connection factory which will create
* connections using the provided connection factory and periodically
@@ -73,13 +71,15 @@
*
* @param connectionFactory
* The connection factory to use for creating connections.
- * @param interval
- * The period between keepalive pings.
+ * @param timeout
+ * The time to wait between keepalive pings.
+ * @param unit
+ * The time unit of the timeout argument.
*/
- public HeartBeatConnectionFactory(
- ConnectionFactory<?> connectionFactory, int interval)
+ HeartBeatConnectionFactory(ConnectionFactory<?> connectionFactory,
+ long timeout, TimeUnit unit)
{
- this(connectionFactory, DEFAULT_SEARCH, interval);
+ this(connectionFactory, timeout, unit, DEFAULT_SEARCH);
}
@@ -98,18 +98,18 @@
*
* @param connectionFactory
* The connection factory to use for creating connections.
+ * @param timeout
+ * The time to wait between keepalive pings.
+ * @param unit
+ * The time unit of the timeout argument.
* @param heartBeat
* The search request to use when pinging connections.
- * @param interval
- * The period between keepalive pings.
*/
- public HeartBeatConnectionFactory(
- ConnectionFactory<?> connectionFactory, SearchRequest heartBeat,
- int interval)
+ HeartBeatConnectionFactory(ConnectionFactory<?> connectionFactory,
+ long timeout, TimeUnit unit, SearchRequest heartBeat)
{
- Validator.ensureNotNull(connectionFactory, heartBeat);
this.heartBeat = heartBeat;
- this.interval = interval;
+ this.interval = unit.toMillis(timeout);
this.activeConnections = new LinkedList<AsynchronousConnectionImpl>();
this.parentFactory = connectionFactory;
--
Gitblit v1.10.0