[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

[aleksey]

Updated Branches:
  refs/heads/trunk 02b515766 -> 1ffdaae24


Merge branch 'cassandra-1.2' into trunk

Conflicts:
        src/java/org/apache/cassandra/thrift/CassandraServer.java


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

Branch: refs/heads/trunk
Commit: 1ffdaae24bef68dc5341f7f9e91ffdcc4444f36f
Parents: 02b5157 4c25eef
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Fri Jan 11 03:03:16 2013 +0300
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Fri Jan 11 03:03:16 2013 +0300

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 +
 .../apache/cassandra/thrift/CassandraServer.java   |   19 ++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ffdaae2/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ffdaae2/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/thrift/CassandraServer.java
index 3ca44a9,7baeb17..4e87c3f
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@@ -1002,9 -879,23 +1002,23 @@@ public class CassandraServer implement
          }
      }
  
+     private void validateLogin() throws InvalidRequestException
+     {
+         try
+         {
+             state().validateLogin();
+         }
+         catch (UnauthorizedException e)
+         {
+             throw new InvalidRequestException(e.getMessage());
+         }
+     }
+ 
      public KsDef describe_keyspace(String table) throws NotFoundException, 
InvalidRequestException
      {
+         validateLogin();
+ 
 -        KSMetaData ksm = Schema.instance.getTableDefinition(table);
 +        KSMetaData ksm = Schema.instance.getKSMetaData(table);
          if (ksm == null)
              throw new NotFoundException();