You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/04/23 21:11:23 UTC
[2/4] storm git commit: Replace JedisPool.returnResource to
Jedis.close() in order to deprecation
Replace JedisPool.returnResource to Jedis.close() in order to deprecation
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a37397e5
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a37397e5
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a37397e5
Branch: refs/heads/master
Commit: a37397e5a16c682e70ffe77b272577db7391eb41
Parents: 96f3de6
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Apr 3 15:45:22 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Apr 3 15:45:22 2015 +0900
----------------------------------------------------------------------
.../storm/redis/common/container/JedisContainer.java | 7 +------
.../apache/storm/redis/trident/state/RedisMapState.java | 10 ++++++----
2 files changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a37397e5/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisContainer.java
----------------------------------------------------------------------
diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisContainer.java b/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisContainer.java
index 621c05b..8e1fdf5 100644
--- a/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisContainer.java
+++ b/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisContainer.java
@@ -49,12 +49,7 @@ public class JedisContainer implements JedisCommandsInstanceContainer, Closeable
try {
((Closeable) jedisCommands).close();
} catch (IOException e) {
- LOG.warn("Failed to close (return) instance to pool");
- try {
- jedisPool.returnBrokenResource((Jedis) jedisCommands);
- } catch (Exception e2) {
- LOG.error("Failed to discard instance from pool");
- }
+ LOG.error("Failed to close (return) instance to pool");
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/a37397e5/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisMapState.java
----------------------------------------------------------------------
diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisMapState.java b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisMapState.java
index 7bc5afb..82ca8bb 100644
--- a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisMapState.java
+++ b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisMapState.java
@@ -234,7 +234,7 @@ public class RedisMapState<T> implements IBackingMap<T> {
return deserializeValues(keys, values);
} finally {
if (jedis != null) {
- jedisPool.returnResource(jedis);
+ jedis.close();
}
}
} else {
@@ -245,7 +245,7 @@ public class RedisMapState<T> implements IBackingMap<T> {
return deserializeValues(keys, values);
} finally {
if (jedis != null) {
- jedisPool.returnResource(jedis);
+ jedis.close();
}
}
}
@@ -284,7 +284,7 @@ public class RedisMapState<T> implements IBackingMap<T> {
jedis.mset(keyValue);
} finally {
if (jedis != null) {
- jedisPool.returnResource(jedis);
+ jedis.close();
}
}
} else {
@@ -298,7 +298,9 @@ public class RedisMapState<T> implements IBackingMap<T> {
jedis.hmset(this.options.hkey, keyValues);
} finally {
- jedisPool.returnResource(jedis);
+ if (jedis != null) {
+ jedis.close();
+ }
}
}
}