Merge pull request #124 from ssteo/master

Fixed authentication issue and performance issue after authenticated
fluentcassandra · Mar 20, 2013 · 31f5ab3 · 31f5ab3
2 parents 8c7bf03 + dcc948c
commit 31f5ab3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/CassandraSession.cs b/src/CassandraSession.cs
@@ -111,7 +111,7 @@ internal CassandraClientWrapper GetClient(bool setKeyspace = true, bool? setCqlV
 			if (setCqlVersion.Value)
 				_connection.SetCqlVersion(builder.CqlVersion);
 
-			if (setLogin && !String.IsNullOrWhiteSpace(builder.Username) && !String.IsNullOrWhiteSpace(builder.Password))
+			if (!IsAuthenticated && setLogin && !String.IsNullOrWhiteSpace(builder.Username) && !String.IsNullOrWhiteSpace(builder.Password))
 				Login(builder.Username, builder.Password);
 
 			return new CassandraClientWrapper(_connection.Client);
@@ -149,7 +149,7 @@ public void Login(string username, string password)
 
 			try
 			{
-				GetClient(setLogin: false).login(auth);
+				GetClient(setKeyspace: false, setLogin: false).login(auth);
 				IsAuthenticated = true;
 			}
 			catch (Exception exc)