From 3da6edb440f8d6c2c88d235e68eb11b5c90ee76f Mon Sep 17 00:00:00 2001 From: Roman Gorodischer Date: Sat, 12 Jul 2014 22:27:02 +0300 Subject: [PATCH] Fixed bug in max reconnection delay initialization. --- src/main/java/net/spy/memcached/ConnectionFactory.java | 2 +- src/main/java/net/spy/memcached/MemcachedConnection.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/spy/memcached/ConnectionFactory.java b/src/main/java/net/spy/memcached/ConnectionFactory.java index 0c0cde78e..6ab57ece7 100644 --- a/src/main/java/net/spy/memcached/ConnectionFactory.java +++ b/src/main/java/net/spy/memcached/ConnectionFactory.java @@ -159,7 +159,7 @@ MemcachedNode createMemcachedNode(SocketAddress sa, SocketChannel c, HashAlgorithm getHashAlg(); /** - * Maximum number of milliseconds to wait between reconnect attempts. + * Maximum number of seconds to wait between reconnect attempts. */ long getMaxReconnectDelay(); diff --git a/src/main/java/net/spy/memcached/MemcachedConnection.java b/src/main/java/net/spy/memcached/MemcachedConnection.java index 09f7c49ce..1464ffd54 100644 --- a/src/main/java/net/spy/memcached/MemcachedConnection.java +++ b/src/main/java/net/spy/memcached/MemcachedConnection.java @@ -259,7 +259,7 @@ public MemcachedConnection(final int bufSize, final ConnectionFactory f, addedQueue = new ConcurrentLinkedQueue(); failureMode = fm; shouldOptimize = f.shouldOptimize(); - maxDelay = TimeUnit.SECONDS.toMillis(f.getMaxReconnectDelay()); + maxDelay = f.getMaxReconnectDelay(); opFact = opfactory; timeoutExceptionThreshold = f.getTimeoutExceptionThreshold(); selector = Selector.open();