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 2011/04/26 23:44:33 UTC
svn commit: r1096923 - in /cassandra/branches/cassandra-0.8: drivers/py/
drivers/txpy/ src/java/org/apache/cassandra/service/ClientState.java
Author: jbellis
Date: Tue Apr 26 21:44:33 2011
New Revision: 1096923
URL: http://svn.apache.org/viewvc?rev=1096923&view=rev
Log:
ignore MANIFEST maven effluvia
patch by Stephen Connolly for CASSANDRA-2560
Modified:
cassandra/branches/cassandra-0.8/drivers/py/ (props changed)
cassandra/branches/cassandra-0.8/drivers/txpy/ (props changed)
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/ClientState.java
Propchange: cassandra/branches/cassandra-0.8/drivers/py/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 26 21:44:33 2011
@@ -0,0 +1 @@
+MANIFEST
Propchange: cassandra/branches/cassandra-0.8/drivers/txpy/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 26 21:44:33 2011
@@ -0,0 +1 @@
+MANIFEST
Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/ClientState.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/ClientState.java?rev=1096923&r1=1096922&r2=1096923&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/ClientState.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/ClientState.java Tue Apr 26 21:44:33 2011
@@ -129,7 +129,11 @@ public class ClientState
{
validateLogin();
validateKeyspace();
-
+
+ // hardcode disallowing messing with system keyspace
+ if (keyspace.equalsIgnoreCase("system"))
+ throw new InvalidRequestException("system keyspace is not user-modifiable");
+
resourceClear();
resource.add(keyspace);
Set<Permission> perms = DatabaseDescriptor.getAuthority().authorize(user, resource);