Return-Path: Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: (qmail 51707 invoked from network); 26 Feb 2011 01:19:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 26 Feb 2011 01:19:26 -0000 Received: (qmail 89035 invoked by uid 500); 26 Feb 2011 01:19:25 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 89001 invoked by uid 500); 26 Feb 2011 01:19:25 -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 88992 invoked by uid 99); 26 Feb 2011 01:19:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Feb 2011 01:19:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Feb 2011 01:19:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7DF2D23888EC; Sat, 26 Feb 2011 01:19:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1074773 - /cassandra/trunk/src/java/org/apache/cassandra/db/migration/UpdateColumnFamily.java Date: Sat, 26 Feb 2011 01:19:04 -0000 To: commits@cassandra.apache.org From: eevans@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110226011904.7DF2D23888EC@eris.apache.org> Author: eevans Date: Sat Feb 26 01:19:04 2011 New Revision: 1074773 URL: http://svn.apache.org/viewvc?rev=1074773&view=rev Log: invoke toString() instead of casting Patch by eevans; reviewed by gdusbabek for CASSANDRA-2196 Modified: cassandra/trunk/src/java/org/apache/cassandra/db/migration/UpdateColumnFamily.java Modified: cassandra/trunk/src/java/org/apache/cassandra/db/migration/UpdateColumnFamily.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/migration/UpdateColumnFamily.java?rev=1074773&r1=1074772&r2=1074773&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/db/migration/UpdateColumnFamily.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/db/migration/UpdateColumnFamily.java Sat Feb 26 01:19:04 2011 @@ -49,7 +49,7 @@ public class UpdateColumnFamily extends { for (ColumnDef entry : cf_def.column_metadata) { - if (entry.index_name != null && !Migration.isLegalName((String) entry.index_name)) + if (entry.index_name != null && !Migration.isLegalName(entry.index_name.toString())) throw new ConfigurationException("Invalid index name: " + entry.index_name); } }