Update spymemcached to 2.10.2 and couchbase-client to 1.2.2

Martin Grotzke · Martin Grotzke · commit 17c357dfafc1 · 2013-11-26T21:51:13.000+01:00
The password now has to be passed as empty string to the couchbaseclient,
because it refuses to accept null.
diff --git a/core/pom.xml b/core/pom.xml
@@ -39,15 +39,15 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>spy</groupId>
+			<groupId>net.spy</groupId>
 			<artifactId>spymemcached</artifactId>
-			<version>2.8.12</version>
+			<version>2.10.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
-			<groupId>couchbase</groupId>
+			<groupId>com.couchbase.client</groupId>
 			<artifactId>couchbase-client</artifactId>
-			<version>1.1.4</version>
+			<version>1.2.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<!-- Needed if used with membase via http -->
diff --git a/core/src/main/java/de/javakaffee/web/msm/MemcachedSessionService.java b/core/src/main/java/de/javakaffee/web/msm/MemcachedSessionService.java
@@ -38,6 +38,7 @@
 import net.spy.memcached.ConnectionFactory;
 import net.spy.memcached.ConnectionFactoryBuilder;
 import net.spy.memcached.DefaultConnectionFactory;
+import net.spy.memcached.FailureMode;
 import net.spy.memcached.MemcachedClient;
 import net.spy.memcached.auth.AuthDescriptor;
 import net.spy.memcached.auth.PlainCallbackHandler;
@@ -62,7 +63,6 @@
 import de.javakaffee.web.msm.BackupSessionTask.BackupResult;
 import de.javakaffee.web.msm.LockingStrategy.LockingMode;
 import de.javakaffee.web.msm.MemcachedNodesManager.MemcachedClientCallback;
-import net.spy.memcached.FailureMode;
 
 /**
  * This is the core of memcached session manager, managing sessions in memcached.
@@ -495,14 +495,15 @@ protected MemcachedClient createMemcachedClient( final MemcachedNodesManager mem
             return null;
         }
         try {
-            final ConnectionType connectionType = ConnectionType.valueOf(memcachedNodesManager.isCouchbaseBucketConfig(), _username, _password);
+            final String password = _password == null ? "" : _password;
+            final ConnectionType connectionType = ConnectionType.valueOf(memcachedNodesManager.isCouchbaseBucketConfig(), _username, password);
             if (connectionType.isCouchbaseBucketConfig()) {
             	// For membase connectivity: https://docs.couchbase.org/membase-sdk-java-api-reference/membase-sdk-java-started.html
             	// And: https://code.google.com/p/spymemcached/wiki/Examples#Establishing_a_Membase_Connection
                 final CouchbaseConnectionFactoryBuilder factory = new CouchbaseConnectionFactoryBuilder();
                 factory.setOpTimeout(_operationTimeout);
                 factory.setFailureMode(FailureMode.Redistribute);
-                return new CouchbaseClient(factory.buildCouchbaseConnection(memcachedNodesManager.getCouchbaseBucketURIs(), _username, _password));
+                return new CouchbaseClient(factory.buildCouchbaseConnection(memcachedNodesManager.getCouchbaseBucketURIs(), _username, password));
             }
             final ConnectionFactory connectionFactory = createConnectionFactory(memcachedNodesManager, connectionType, statistics);
             return new MemcachedClient(connectionFactory, memcachedNodesManager.getAllMemcachedAddresses());
@@ -515,7 +516,8 @@ protected ConnectionFactory createConnectionFactory(final MemcachedNodesManager
             final ConnectionType connectionType, final Statistics statistics ) {
         if (PROTOCOL_BINARY.equals( _memcachedProtocol )) {
             if (connectionType.isSASL()) {
-                final AuthDescriptor authDescriptor = new AuthDescriptor(new String[]{"PLAIN"}, new PlainCallbackHandler(_username, _password));
+                final AuthDescriptor authDescriptor = new AuthDescriptor(new String[]{"PLAIN"},
+                        new PlainCallbackHandler(_username, _password == null ? "" : _password));
                 return memcachedNodesManager.isEncodeNodeIdInSessionId()
                         ? new SuffixLocatorBinaryConnectionFactory( memcachedNodesManager,
                                 memcachedNodesManager.getSessionIdFormat(), statistics, _operationTimeout,
diff --git a/core/src/main/java/de/javakaffee/web/msm/SuffixBasedNodeLocator.java b/core/src/main/java/de/javakaffee/web/msm/SuffixBasedNodeLocator.java
