merge fix

sazzad16 · web-flow · commit 96eb67a1db17 · 2020-04-16T13:08:38.000+06:00
diff --git a/src/main/java/redis/clients/jedis/JedisSentinelPool.java b/src/main/java/redis/clients/jedis/JedisSentinelPool.java
@@ -55,7 +55,7 @@ public JedisSentinelPool(String masterName, Set<String> sentinels, String passwo
 
   public JedisSentinelPool(String masterName, Set<String> sentinels, String password, String sentinelPassword) {
     this(masterName, sentinels,  new GenericObjectPoolConfig(),  Protocol.DEFAULT_TIMEOUT,  Protocol.DEFAULT_TIMEOUT,
-        password,Protocol.DEFAULT_DATABASE, null, Protocol.DEFAULT_TIMEOUT, Protocol.DEFAULT_TIMEOUT, sentinelPassword, null);
+        null, password, Protocol.DEFAULT_DATABASE, null, Protocol.DEFAULT_TIMEOUT, Protocol.DEFAULT_TIMEOUT, sentinelPassword, null);
   }
 
   public JedisSentinelPool(String masterName, Set<String> sentinels,

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public JedisSentinelPool(String masterName, Set<String> sentinels, String passwo`
`55`	`55`
`56`	`56`	`public JedisSentinelPool(String masterName, Set<String> sentinels, String password, String sentinelPassword) {`
`57`	`57`	`this(masterName, sentinels, new GenericObjectPoolConfig(), Protocol.DEFAULT_TIMEOUT, Protocol.DEFAULT_TIMEOUT,`
`58`		`- password,Protocol.DEFAULT_DATABASE, null, Protocol.DEFAULT_TIMEOUT, Protocol.DEFAULT_TIMEOUT, sentinelPassword, null);`
	`58`	`+ null, password, Protocol.DEFAULT_DATABASE, null, Protocol.DEFAULT_TIMEOUT, Protocol.DEFAULT_TIMEOUT, sentinelPassword, null);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public JedisSentinelPool(String masterName, Set<String> sentinels,`