Move dataSource reset before connection returned

Move dataSource reset before connection returned to pool. If datasource reset after the connection returned to pool, it might reset the datasource after it was allocated to another thread
redis · Dec 17, 2018 · df1bffa · df1bffa
1 parent 95aa6a9
commit df1bffa
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java
@@ -3452,12 +3452,13 @@ public Map<String, String> pubsubNumSub(String... channels) {
   @Override
   public void close() {
     if (dataSource != null) {
+      JedisPoolAbstract pool = this.dataSource;
+      this.dataSource = null;
       if (client.isBroken()) {
-        this.dataSource.returnBrokenResource(this);
+        pool.returnBrokenResource(this);
       } else {
-        this.dataSource.returnResource(this);
+        pool.returnResource(this);
       }
-      this.dataSource = null;
     } else {
       super.close();
     }