Merge pull request #30 from yuetang95/master

Improve ClientMode determination logic

Author: QuChen88

src/main/java/net/spy/memcached/ClientMode.java

@@ -9,7 +9,10 @@
  * The modes in which the client can operate. 
  */
 public enum ClientMode {
-
+  /**
+   * Default client mode, we will perform mode discovery based on the endpoint dns name.
+   */
+  Unset,
   /**
    * In Static Client mode, the set of endpoints specified during initialization is used throughout the lifetime of the client object.
    */

src/main/java/net/spy/memcached/ConnectionFactory.java

@@ -117,7 +117,12 @@ MemcachedNode createMemcachedNode(SocketAddress sa, SocketChannel c,
    * @return the clientMode.
    */
   ClientMode getClientMode();
-  
+
+  /**
+   * Set the client mode in client. Should only be used in the constructor when determine the client mode.
+   */
+  void setClientMode(ClientMode clientMode);
+
   /**
    * The interval used for periodic polling of configuration. 
    * @return the interval in milliseconds

src/main/java/net/spy/memcached/DefaultConnectionFactory.java

@@ -73,7 +73,7 @@ public class DefaultConnectionFactory extends SpyObject implements
   /**
    * Default client mode.
    */
-  public static final ClientMode DEFAULT_CLIENT_MODE = ClientMode.Dynamic;
+  public static final ClientMode DEFAULT_CLIENT_MODE = ClientMode.Unset;
 
   /**
    * Default failure mode.
@@ -132,7 +132,7 @@ public class DefaultConnectionFactory extends SpyObject implements
    */
   public static final long DEFAULT_AUTH_WAIT_TIME = 1000;
 
-  private final ClientMode clientMode;
+  private ClientMode clientMode;
   protected final int opQueueLen;
   private final int readBufSize;
   private final HashAlgorithm hashAlg;
@@ -205,7 +205,12 @@ public DefaultConnectionFactory() {
   public ClientMode getClientMode(){
     return clientMode;
   }
-  
+
+  @Override
+  public void setClientMode(ClientMode clientMode) {
+    this.clientMode = clientMode;
+  }
+
   public long getDynamicModePollingInterval(){
     return ConfigurationPoller.DEFAULT_POLL_INTERVAL;
   }

src/main/java/net/spy/memcached/MemcachedClient.java

@@ -226,9 +226,9 @@ public MemcachedClient(List<InetSocketAddress> addrs) throws IOException {
   }
 
   public MemcachedClient(ConnectionFactory cf, List<InetSocketAddress> addrs) throws IOException{
-    this(cf, addrs, false);
+    this(cf, addrs, cf != null && cf.getClientMode() == ClientMode.Unset);
   }
-  
+
   /**
    * Get a memcache client over the specified memcached locations.
    *
@@ -255,13 +255,11 @@ private MemcachedClient(ConnectionFactory cf, List<InetSocketAddress> addrs, boo
         String hostName = addrs.get(0).getHostName();
         //All config endpoints has ".cfg." subdomain in the DNS name.
         if(hostName != null && hostName.contains(".cfg.")){
-          cf = new DefaultConnectionFactory(ClientMode.Dynamic);
+          cf = updateClientMode(cf, ClientMode.Dynamic);
         }
       }
       //Fallback to static mode
-      if(cf == null){
-        cf = new DefaultConnectionFactory(ClientMode.Static);
-      }
+      cf = updateClientMode(cf, ClientMode.Static);
     }
 
     if (cf == null) {
@@ -276,7 +274,6 @@ private MemcachedClient(ConnectionFactory cf, List<InetSocketAddress> addrs, boo
       throw new IllegalArgumentException("Only one configuration endpoint is valid with dynamic client mode.");
     }
 
-    
     connFactory = cf;
     clientMode = cf.getClientMode();
     tcService = new TranscodeService(cf.isDaemon());
@@ -297,7 +294,16 @@ private MemcachedClient(ConnectionFactory cf, List<InetSocketAddress> addrs, boo
       addObserver(this);
     }
   }
-  
+
+  private ConnectionFactory updateClientMode(ConnectionFactory f, ClientMode mode) {
+    if (f == null) {
+      f = new DefaultConnectionFactory(mode);
+    } else {
+      f.setClientMode(mode);
+    }
+    return f;
+  }
+    
   /**
    * Establish a connection to the configuration endpoint and get the list of cache node endpoints. Then initialize the 
    * memcached client with the cache node endpoints list.