Preserve atomicity of setHostAndPort method

- Add copy() to JedisSocketFactory interface

Author: mina-asham

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

@@ -121,4 +121,12 @@ public int getSoTimeout() {
   public void setSoTimeout(int soTimeout) {
     this.soTimeout = soTimeout;
   }
+
+  @Override
+  public JedisSocketFactory copy() {
+    return new DefaultJedisSocketFactory(
+      this.host, this.port, this.connectionTimeout, this.soTimeout,
+      this.ssl, this.sslSocketFactory, this.sslParameters, this.hostnameVerifier
+    );
+  }
 }

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

@@ -1,6 +1,7 @@
 package redis.clients.jedis;
 
 import java.net.URI;
+import java.util.concurrent.atomic.AtomicReference;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLParameters;
@@ -18,14 +19,14 @@
  * PoolableObjectFactory custom impl.
  */
 class JedisFactory implements PooledObjectFactory<Jedis> {
-  private final JedisSocketFactory jedisSocketFactory;
+  private final AtomicReference<JedisSocketFactory> jedisSocketFactory;
   private final String user;
   private final String password;
   private final int database;
   private final String clientName;
 
   JedisFactory(final JedisSocketFactory jedisSocketFactory, final String user, final String password, final int database, final String clientName) {
-    this.jedisSocketFactory = jedisSocketFactory;
+    this.jedisSocketFactory = new AtomicReference<>(jedisSocketFactory);
     this.user = user;
     this.password = password;
     this.database = database;
@@ -73,20 +74,22 @@ class JedisFactory implements PooledObjectFactory<Jedis> {
         "Cannot open Redis connection due invalid URI. %s", uri.toString()));
     }
 
-    this.jedisSocketFactory = new DefaultJedisSocketFactory(
-        uri.getHost(), uri.getPort(), connectionTimeout, soTimeout,
-        JedisURIHelper.isRedisSSLScheme(uri), sslSocketFactory,
-        sslParameters, hostnameVerifier
-    );
+    this.jedisSocketFactory = new AtomicReference<JedisSocketFactory>(new DefaultJedisSocketFactory(
+      uri.getHost(), uri.getPort(), connectionTimeout, soTimeout,
+      JedisURIHelper.isRedisSSLScheme(uri), sslSocketFactory,
+      sslParameters, hostnameVerifier
+    ));
     this.user = JedisURIHelper.getUser(uri);
     this.password = JedisURIHelper.getPassword(uri);
     this.database = JedisURIHelper.getDBIndex(uri);
     this.clientName = clientName;
   }
 
   public void setHostAndPort(final HostAndPort hostAndPort) {
-    jedisSocketFactory.setHost(hostAndPort.getHost());
-    jedisSocketFactory.setPort(hostAndPort.getPort());
+    JedisSocketFactory newFactory = jedisSocketFactory.get().copy();
+    newFactory.setHost(hostAndPort.getHost());
+    newFactory.setPort(hostAndPort.getPort());
+    jedisSocketFactory.set(newFactory);
   }
 
   @Override
@@ -114,7 +117,7 @@ public void destroyObject(PooledObject<Jedis> pooledJedis) throws Exception {
 
   @Override
   public PooledObject<Jedis> makeObject() throws Exception {
-    final Jedis jedis = new Jedis(jedisSocketFactory);
+    final Jedis jedis = new Jedis(jedisSocketFactory.get());
     try {
       jedis.connect();
       if (user != null) {
@@ -145,8 +148,9 @@ public void passivateObject(PooledObject<Jedis> pooledJedis) throws Exception {
   public boolean validateObject(PooledObject<Jedis> pooledJedis) {
     final BinaryJedis jedis = pooledJedis.getObject();
     try {
-      String host = jedisSocketFactory.getHost();
-      int port = jedisSocketFactory.getPort();
+      JedisSocketFactory factory = this.jedisSocketFactory.get();
+      String host = factory.getHost();
+      int port = factory.getPort();
 
       String connectionHost = jedis.getClient().getHost();
       int connectionPort = jedis.getClient().getPort();

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

@@ -34,4 +34,6 @@ public interface JedisSocketFactory {
   int getSoTimeout();
 
   void setSoTimeout(int soTimeout);
+
+  JedisSocketFactory copy();
 }

src/test/java/redis/clients/jedis/tests/UdsTest.java

@@ -82,5 +82,10 @@ public int getSoTimeout() {
     @Override
     public void setSoTimeout(int soTimeout) {
     }
+
+    @Override
+    public JedisSocketFactory copy() {
+      return this;
+    }
   }
 }