Author: jbellis
Date: Tue Oct 20 00:28:11 2009
New Revision: 826916
URL: http://svn.apache.org/viewvc?rev=826916&view=rev
Log:
Fix using non-utf8-aware comparison as a sanity check in SC.putColumn. patch
by jbellis; tested by Edmond Lau for CASSANDRA-493
Modified:
incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/SuperColumn.java
Modified:
incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/SuperColumn.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/SuperColumn.java?rev=826916&r1=826915&r2=826916&view=diff
==============================================================================
---
incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/SuperColumn.java
(original)
+++
incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/SuperColumn.java
Tue Oct 20 00:28:11 2009
@@ -201,14 +201,7 @@
*/
public void putColumn(IColumn column)
{
- if (!(column instanceof SuperColumn))
- {
- throw new UnsupportedOperationException("Only Super column objects
should be put here");
- }
- if (!Arrays.equals(name_, column.name()))
- {
- throw new IllegalArgumentException("The name should match the name
of the current column or super column");
- }
+ assert column instanceof SuperColumn;
for (IColumn subColumn : column.getSubColumns())
{
