Browse Source

getCounter、hgetCounter 恢复 4.9 版本

James 5 years ago
parent
commit
fb0c09e26c
1 changed files with 4 additions and 16 deletions
  1. 4 16
      src/main/java/com/jfinal/plugin/redis/Cache.java

+ 4 - 16
src/main/java/com/jfinal/plugin/redis/Cache.java

@@ -597,14 +597,8 @@ public class Cache {
 	public Long hgetCounter(Object key, Object field) {
 		Jedis jedis = getJedis();
 		try {
-			Object ret = valueFromBytes(jedis.hget(keyToBytes(keyNamingPolicy.getKeyName(key)), fieldToBytes(keyNamingPolicy.getKeyName(field))));
-			if (ret instanceof String) {
-				return Long.parseLong((String)ret);
-			} else if (ret instanceof Long) {
-				return (Long)ret;
-			} else {
-				return null;
-			}
+			String ret = jedis.hget(keyNamingPolicy.getKeyName(key), keyNamingPolicy.getKeyName(field));
+			return ret != null ? Long.parseLong(ret) : null;
 		}
 		finally {close(jedis);}
 	}
@@ -655,14 +649,8 @@ public class Cache {
 	public Long getCounter(Object key) {
 		Jedis jedis = getJedis();
 		try {
-			Object ret = valueFromBytes(jedis.get(keyToBytes(keyNamingPolicy.getKeyName(key))));
-			if (ret instanceof String) {
-				return Long.parseLong((String)ret);
-			} else if (ret instanceof Long) {
-				return (Long)ret;
-			} else {
-				return null;
-			}
+			String ret = (String)jedis.get(keyNamingPolicy.getKeyName(key));
+			return ret != null ? Long.parseLong(ret) : null;
 		}
 		finally {close(jedis);}
 	}