Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A50951083F for ; Fri, 16 Aug 2013 02:06:34 +0000 (UTC) Received: (qmail 42932 invoked by uid 500); 16 Aug 2013 02:06:34 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 42885 invoked by uid 500); 16 Aug 2013 02:06:34 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 42874 invoked by uid 99); 16 Aug 2013 02:06:34 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Aug 2013 02:06:34 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E689A837B26; Fri, 16 Aug 2013 02:06:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Fri, 16 Aug 2013 02:06:33 -0000 Message-Id: <06f0288417a245978c4aa6873fa7879c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/5] git commit: Skip auth setup if AllowAllAuthenticator is used Updated Branches: refs/heads/trunk 8f243a912 -> 0dd3438ac Skip auth setup if AllowAllAuthenticator is used Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea712bbb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea712bbb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea712bbb Branch: refs/heads/trunk Commit: ea712bbbe8bb66ceb439dad0ddbb10da18a19c22 Parents: 82081c7 Author: Aleksey Yeschenko Authored: Fri Aug 16 04:52:30 2013 +0300 Committer: Aleksey Yeschenko Committed: Fri Aug 16 04:52:30 2013 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/auth/Auth.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea712bbb/src/java/org/apache/cassandra/auth/Auth.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/auth/Auth.java b/src/java/org/apache/cassandra/auth/Auth.java index c561aab..c9a42a2 100644 --- a/src/java/org/apache/cassandra/auth/Auth.java +++ b/src/java/org/apache/cassandra/auth/Auth.java @@ -122,6 +122,9 @@ public class Auth */ public static void setup() { + if (DatabaseDescriptor.getAuthenticator() instanceof AllowAllAuthenticator) + return; + setupAuthKeyspace(); setupUsersTable();