Reset shardjedis datasource (#1939)

Reset shardjedis dataSource before returned to pool

Related to #1920
As it had fixed in Jedis.java, SharedJedis.java should be fixed too.

Author: timothyzhw

src/main/java/redis/clients/jedis/ShardedJedis.java

@@ -799,7 +799,7 @@ public Long bitpos(final String key, boolean value, final BitPosParams params) {
   /**
    * This method is deprecated due to bug (scan cursor should be unsigned long)
    * And will be removed on next major release
-   * @see https://github.com/xetorthio/jedis/issues/531 
+   * @see https://github.com/xetorthio/jedis/issues/531
    */
   public ScanResult<Entry<String, String>> hscan(String key, int cursor) {
     Jedis j = getShard(key);
@@ -810,7 +810,7 @@ public ScanResult<Entry<String, String>> hscan(String key, int cursor) {
   /**
    * This method is deprecated due to bug (scan cursor should be unsigned long)
    * And will be removed on next major release
-   * @see https://github.com/xetorthio/jedis/issues/531 
+   * @see https://github.com/xetorthio/jedis/issues/531
    */
   public ScanResult<String> sscan(String key, int cursor) {
     Jedis j = getShard(key);
@@ -821,7 +821,7 @@ public ScanResult<String> sscan(String key, int cursor) {
   /**
    * This method is deprecated due to bug (scan cursor should be unsigned long)
    * And will be removed on next major release
-   * @see https://github.com/xetorthio/jedis/issues/531 
+   * @see https://github.com/xetorthio/jedis/issues/531
    */
   public ScanResult<Tuple> zscan(String key, int cursor) {
     Jedis j = getShard(key);
@@ -875,13 +875,13 @@ public void close() {
           break;
         }
       }
-
+      Pool<ShardedJedis> pool = this.dataSource;
+      this.dataSource = null;
       if (broken) {
-        dataSource.returnBrokenResource(this);
+        pool.returnBrokenResource(this);
       } else {
-        dataSource.returnResource(this);
+        pool.returnResource(this);
       }
-      this.dataSource = null;
 
     } else {
       disconnect();