Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c1332efe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1332efe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1332efe Branch: refs/heads/trunk Commit: c1332efe1cb1b8716956daec789319acbbce1288 Parents: 1fc218f Author: Sylvain Lebresne <[email protected]> Authored: Wed Mar 20 09:39:58 2013 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Mar 20 09:39:58 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../apache/cassandra/service/MigrationManager.java | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1332efe/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 6ce5912..174cca4 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,8 @@ 1.2.4 * Fix mixing prepared statements between keyspaces (CASSANDRA-5352) * Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354) + * Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362) + 1.2.3 * add check for sstable overlap within a level on startup (CASSANDRA-5327) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1332efe/src/java/org/apache/cassandra/service/MigrationManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/MigrationManager.java b/src/java/org/apache/cassandra/service/MigrationManager.java index 7b9d64b..2411fe8 100644 --- a/src/java/org/apache/cassandra/service/MigrationManager.java +++ b/src/java/org/apache/cassandra/service/MigrationManager.java @@ -220,7 +220,7 @@ public class MigrationManager implements IEndpointStateChangeSubscriber if (ksm == null) throw new ConfigurationException(String.format("Cannot add column family '%s' to non existing keyspace '%s'.", cfm.cfName, cfm.ksName)); else if (ksm.cfMetaData().containsKey(cfm.cfName)) - throw new AlreadyExistsException(cfm.cfName, cfm.ksName); + throw new AlreadyExistsException(cfm.ksName, cfm.cfName); logger.info(String.format("Create new ColumnFamily: %s", cfm)); announce(cfm.toSchema(FBUtilities.timestampMicros()));
