From 9006178a05df3586cc4bfac61634f3bed735cbc1 Mon Sep 17 00:00:00 2001 From: Jonathan Leibiusky Date: Fri, 3 Jun 2011 11:48:55 -0300 Subject: [PATCH] JedisPool timeout was broken. Values <= 0 where treated as -1, where 0 is infinite --- src/main/java/redis/clients/jedis/JedisPool.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/redis/clients/jedis/JedisPool.java b/src/main/java/redis/clients/jedis/JedisPool.java index d63de39..0f4fe4b 100644 --- a/src/main/java/redis/clients/jedis/JedisPool.java +++ b/src/main/java/redis/clients/jedis/JedisPool.java @@ -48,17 +48,12 @@ public class JedisPool extends Pool { super(); this.host = host; this.port = port; - this.timeout = (timeout > 0) ? timeout : -1; + this.timeout = timeout; this.password = password; } public Object makeObject() throws Exception { - final Jedis jedis; - if (timeout > 0) { - jedis = new Jedis(this.host, this.port, this.timeout); - } else { - jedis = new Jedis(this.host, this.port); - } + final Jedis jedis = new Jedis(this.host, this.port, this.timeout); jedis.connect(); if (null != this.password) {