浏览代码

jfinal 4.6

James 6 年之前
父节点
当前提交
2495961471
共有 1 个文件被更改,包括 5 次插入5 次删除
  1. 5 5
      src/main/java/com/jfinal/plugin/redis/RedisPlugin.java

+ 5 - 5
src/main/java/com/jfinal/plugin/redis/RedisPlugin.java

@@ -94,14 +94,14 @@ public class RedisPlugin implements IPlugin {
 	
 	public boolean start() {
 		JedisPool jedisPool;
-		if      (port != null && timeout != null && password != null && database != null && clientName != null)
+		if      (port != null && timeout != null && database != null && clientName != null)
 			jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout, password, database, clientName);
-		else if (port != null && timeout != null && password != null && database != null)
+		else if (port != null && timeout != null && database != null)
 			jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout, password, database);
-		else if (port != null && timeout != null && password != null)
-			jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout, password);
 		else if (port != null && timeout != null)
-			jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout);
+			jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout, password);
+		// else if (port != null && timeout != null)
+			// jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout);
 		else if (port != null)
 			jedisPool = new JedisPool(jedisPoolConfig, host, port);
 		else