[incubator-dubbo] branch master updated: optimize redis connection release (#1987)

[iluo]

This is an automated email from the ASF dual-hosted git repository.

iluo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git


The following commit(s) were added to refs/heads/master by this push:
     new 7a48fac  optimize redis connection release (#1987)
7a48fac is described below

commit 7a48fac84b14ac6a21c1bdfc5958705dd8dda84d
Author: 凝雨 <ningbe...@163.com>
AuthorDate: Tue Jun 26 11:05:48 2018 +0800

    optimize redis connection release (#1987)
---
 .../apache/dubbo/rpc/protocol/redis/RedisProtocol.java   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git 
a/dubbo-rpc/dubbo-rpc-redis/src/main/java/org/apache/dubbo/rpc/protocol/redis/RedisProtocol.java
 
b/dubbo-rpc/dubbo-rpc-redis/src/main/java/org/apache/dubbo/rpc/protocol/redis/RedisProtocol.java
index 7a5f7d7..5c12a10 100644
--- 
a/dubbo-rpc/dubbo-rpc-redis/src/main/java/org/apache/dubbo/rpc/protocol/redis/RedisProtocol.java
+++ 
b/dubbo-rpc/dubbo-rpc-redis/src/main/java/org/apache/dubbo/rpc/protocol/redis/RedisProtocol.java
@@ -98,15 +98,15 @@ public class RedisProtocol extends AbstractProtocol {
             return new AbstractInvoker<T>(type, url) {
                 @Override
                 protected Result doInvoke(Invocation invocation) throws 
Throwable {
-                    Jedis resource = null;
+                    Jedis jedis = null;
                     try {
-                        resource = jedisPool.getResource();
+                        jedis = jedisPool.getResource();
 
                         if (get.equals(invocation.getMethodName())) {
                             if (invocation.getArguments().length != 1) {
                                 throw new IllegalArgumentException("The redis 
get method arguments mismatch, must only one arguments. interface: " + 
type.getName() + ", method: " + invocation.getMethodName() + ", url: " + url);
                             }
-                            byte[] value = 
resource.get(String.valueOf(invocation.getArguments()[0]).getBytes());
+                            byte[] value = 
jedis.get(String.valueOf(invocation.getArguments()[0]).getBytes());
                             if (value == null) {
                                 return new RpcResult();
                             }
@@ -120,16 +120,16 @@ public class RedisProtocol extends AbstractProtocol {
                             ByteArrayOutputStream output = new 
ByteArrayOutputStream();
                             ObjectOutput value = 
getSerialization(url).serialize(url, output);
                             value.writeObject(invocation.getArguments()[1]);
-                            resource.set(key, output.toByteArray());
+                            jedis.set(key, output.toByteArray());
                             if (expiry > 1000) {
-                                resource.expire(key, expiry / 1000);
+                                jedis.expire(key, expiry / 1000);
                             }
                             return new RpcResult();
                         } else if (delete.equals(invocation.getMethodName())) {
                             if (invocation.getArguments().length != 1) {
                                 throw new IllegalArgumentException("The redis 
delete method arguments mismatch, must only one arguments. interface: " + 
type.getName() + ", method: " + invocation.getMethodName() + ", url: " + url);
                             }
-                            
resource.del(String.valueOf(invocation.getArguments()[0]).getBytes());
+                            
jedis.del(String.valueOf(invocation.getArguments()[0]).getBytes());
                             return new RpcResult();
                         } else {
                             throw new 
UnsupportedOperationException("Unsupported method " + 
invocation.getMethodName() + " in redis service.");
@@ -145,9 +145,9 @@ public class RedisProtocol extends AbstractProtocol {
                         }
                         throw re;
                     } finally {
-                        if (resource != null) {
+                        if (jedis != null) {
                             try {
-                                jedisPool.returnResource(resource);
+                                jedis.close();
                             } catch (Throwable t) {
                                 logger.warn("returnResource error: " + 
t.getMessage(), t);
                             }