cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject git commit: Fix build
Date Tue, 12 Nov 2013 18:25:35 GMT
Updated Branches:
  refs/heads/cassandra-2.0 acea7160e -> 7fb2d24fa


Fix build


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7fb2d24f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7fb2d24f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7fb2d24f

Branch: refs/heads/cassandra-2.0
Commit: 7fb2d24fa35d01eab2ff6e5ebaa6885c795a80b8
Parents: acea716
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Nov 12 19:25:26 2013 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Nov 12 19:25:26 2013 +0100

----------------------------------------------------------------------
 src/java/org/apache/cassandra/tools/SSTableImport.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fb2d24f/src/java/org/apache/cassandra/tools/SSTableImport.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/SSTableImport.java b/src/java/org/apache/cassandra/tools/SSTableImport.java
index 0e8172b..7b65d26 100644
--- a/src/java/org/apache/cassandra/tools/SSTableImport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableImport.java
@@ -44,9 +44,9 @@ import org.apache.cassandra.config.Schema;
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.db.marshal.BytesType;
 import org.apache.cassandra.db.marshal.CompositeType;
-import org.apache.cassandra.db.marshal.MarshalException;
 import org.apache.cassandra.dht.IPartitioner;
 import org.apache.cassandra.io.sstable.SSTableWriter;
+import org.apache.cassandra.serializers.MarshalException;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.JsonParser;
@@ -158,8 +158,7 @@ public class SSTableImport
                 }
                 else if (isRangeTombstone())
                 {
-                    AbstractType<?> type = CompositeType.getInstance(Arrays.asList(new
AbstractType<?>[]{meta.getColumnDefinitionComparator(0)}));
-                    value = type.fromString((String)fields.get(1));
+                    value = comparator.fromString((String)fields.get(1));
                 }
                 else
                 {


Mime
View raw message