From d52cc06b72f14cb020a652cbbb770e32babb62e3 Mon Sep 17 00:00:00 2001
From: Nelson Rodrigues <nelson@nelsonjrodrigues.com>
Date: Mon, 28 Jul 2014 11:44:23 -0700
Subject: [PATCH] Let the user choose whether to testOnBorrow or testOnReturn

Force testOnBorrow if neither is specified.
---
 src/main/java/redis/clients/jedis/JedisSentinelPool.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/redis/clients/jedis/JedisSentinelPool.java b/src/main/java/redis/clients/jedis/JedisSentinelPool.java
index 0aec8d5..c80ae8e 100644
--- a/src/main/java/redis/clients/jedis/JedisSentinelPool.java
+++ b/src/main/java/redis/clients/jedis/JedisSentinelPool.java
@@ -65,8 +65,10 @@ public class JedisSentinelPool extends Pool<Jedis> {
     public JedisSentinelPool(String masterName, Set<String> sentinels,
 	    final GenericObjectPoolConfig poolConfig, int timeout,
 	    final String password, final int database) {
-    // Proper master failover detection dependes on testOnBorrow, so force it here
-    poolConfig.setTestOnBorrow(true);
+    // Proper master failover detection dependes on testOnBorrow or testOnReturn, so force it here
+    if (!poolConfig.getTestOnBorrow() && !poolConfig.getTestOnReturn()) {
+        poolConfig.setTestOnBorrow(true);
+    }
 
 	this.poolConfig = poolConfig;
 	this.timeout = timeout;