Merge pull request #1918 from xetorthio/gkorland-dataSource-reset

Move dataSource reset before connection returned
redis · Dec 18, 2018 · 1e536e8 · 1e536e8
2 parents 95aa6a9 + df1bffa
commit 1e536e8
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();
     }