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/07/19 00:51:32 UTC
git commit: fixes small bug introduced by CASSANDRA-4439
Updated Branches:
refs/heads/cassandra-1.1 202f3940d -> e220efa2a
fixes small bug introduced by CASSANDRA-4439
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e220efa2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e220efa2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e220efa2
Branch: refs/heads/cassandra-1.1
Commit: e220efa2a87c8232d87bdca9f2a02cfcef9f1a4c
Parents: 202f394
Author: Pavel Yaskevich <xe...@apache.org>
Authored: Thu Jul 19 01:49:46 2012 +0300
Committer: Pavel Yaskevich <xe...@apache.org>
Committed: Thu Jul 19 01:49:46 2012 +0300
----------------------------------------------------------------------
.../org/apache/cassandra/config/CFMetaData.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e220efa2/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java
index 5b3f227..9d77912 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -877,6 +877,9 @@ public final class CFMetaData
String oldIndexName = cfm.column_metadata.get(entry.getKey()).getIndexName();
+ if (oldIndexName == null)
+ continue;
+
if (newDef.getIndexName() != null && !oldIndexName.equals(newDef.getIndexName()))
throw new ConfigurationException("Can't modify index name: was '" + oldIndexName + "' changed to '" + newDef.getIndexName() + "'.");