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 21:29:28 UTC
[3/4] git commit: fixes NPE exception in
ClientState.hasKeyspaceSchemaAccess(...) method introduced by CASSANDRA-3759
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/7c374547
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c374547
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7c374547
Branch: refs/heads/trunk
Commit: 7c374547793c30f62366b2a28a2ca2c1d914f146
Parents: 3416110
Author: Pavel Yaskevich <po...@gmail.com>
Authored: Tue Jan 24 22:28:41 2012 +0200
Committer: Pavel Yaskevich <po...@gmail.com>
Committed: Tue Jan 24 22:28:41 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/7c374547/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 923c780..ea1af50 100644
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@ -124,7 +124,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();