You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by xe...@apache.org on 2012/01/24 20:17:15 UTC

git commit: fixes NPE exception in ClientState.hasKeyspaceSchemaAccess(...) method introduced by CASSANDRA-3759

Updated Branches:
  refs/heads/trunk f6edaa855 -> 2f115d434


fixes NPE exception in ClientState.hasKeyspaceSchemaAccess(...) method introduced by CASSANDRA-3759


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f115d43
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f115d43
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f115d43

Branch: refs/heads/trunk
Commit: 2f115d4342e3830fbf320cb4a4f34f4c3613b29d
Parents: f6edaa8
Author: Pavel Yaskevich <po...@gmail.com>
Authored: Tue Jan 24 22:03:57 2012 +0200
Committer: Pavel Yaskevich <po...@gmail.com>
Committed: Tue Jan 24 22:15:06 2012 +0200

----------------------------------------------------------------------
 .../org/apache/cassandra/service/ClientState.java  |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f115d43/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 3c021b0..152d659 100644
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@ -141,7 +141,7 @@ public class ClientState
         validateLogin();
         
         // hardcode disallowing messing with system keyspace
-        if (keyspace.equalsIgnoreCase(Table.SYSTEM_TABLE) && perm == Permission.WRITE)
+        if (keyspace != null && keyspace.equalsIgnoreCase(Table.SYSTEM_TABLE) && perm == Permission.WRITE)
             throw new InvalidRequestException("system keyspace is not user-modifiable");
 
         resourceClear();