You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/10/08 17:26:56 UTC
[2/2] git commit: add cqlVersion to things ClientState.reset cleans
up patch by jbellis; reviewed by dbrosius for CASSANDRA-4657
add cqlVersion to things ClientState.reset cleans up
patch by jbellis; reviewed by dbrosius for CASSANDRA-4657
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b151f3b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b151f3b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b151f3b
Branch: refs/heads/cassandra-1.1
Commit: 5b151f3b3607494f67f502bae1d59e86ab7ceae8
Parents: 8264eb2
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Oct 5 17:29:16 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Oct 8 09:57:55 2012 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/service/ClientState.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b151f3b/src/java/org/apache/cassandra/service/ClientState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/ClientState.java b/src/java/org/apache/cassandra/service/ClientState.java
index 279523f..ba1b502 100644
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@ -20,18 +20,21 @@ package org.apache.cassandra.service;
import java.util.*;
-import org.apache.cassandra.auth.*;
-import org.apache.cassandra.cql3.CFName;
-import org.apache.cassandra.thrift.CqlResult;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.cassandra.auth.AuthenticatedUser;
+import org.apache.cassandra.auth.Permission;
+import org.apache.cassandra.auth.PermissionDenied;
+import org.apache.cassandra.auth.Resources;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.Schema;
import org.apache.cassandra.cql.CQLStatement;
+import org.apache.cassandra.cql3.CFName;
import org.apache.cassandra.db.Table;
import org.apache.cassandra.thrift.AuthenticationException;
+import org.apache.cassandra.thrift.CqlResult;
import org.apache.cassandra.thrift.InvalidRequestException;
import org.apache.cassandra.utils.SemanticVersion;
@@ -145,6 +148,7 @@ public class ClientState
resourceClear();
prepared.clear();
cql3Prepared.clear();
+ cqlVersion = DEFAULT_CQL_VERSION;
}
public void hasKeyspaceAccess(String keyspace, Permission perm) throws InvalidRequestException