cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/3] git commit: fix ClassCastException for #6462
Date Tue, 10 Dec 2013 04:34:37 GMT
Updated Branches:
  refs/heads/cassandra-2.0 2ccb3da7c -> 5d24c5533
  refs/heads/trunk 8010d77eb -> 69c180146


fix ClassCastException for #6462


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

Branch: refs/heads/cassandra-2.0
Commit: 5d24c55335e91fde5470ce94306fde26272e2b44
Parents: 2ccb3da
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Dec 10 10:31:18 2013 +0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Dec 10 10:31:18 2013 +0600

----------------------------------------------------------------------
 .../org/apache/cassandra/db/compaction/CompactionManager.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d24c553/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 310ddfb..168ee02 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -560,7 +560,7 @@ public class CompactionManager implements CompactionManagerMBean
                 throw new IOException("disk full");
 
             ICompactionScanner scanner = cleanupStrategy.getScanner(sstable, getRateLimiter());
-            CleanupInfo ci = new CleanupInfo(sstable, (SSTableScanner)scanner);
+            CleanupInfo ci = new CleanupInfo(sstable, scanner);
 
             metrics.beginCompaction(ci);
             SSTableWriter writer = createWriter(cfs,
@@ -1052,9 +1052,9 @@ public class CompactionManager implements CompactionManagerMBean
     private static class CleanupInfo extends CompactionInfo.Holder
     {
         private final SSTableReader sstable;
-        private final SSTableScanner scanner;
+        private final ICompactionScanner scanner;
 
-        public CleanupInfo(SSTableReader sstable, SSTableScanner scanner)
+        public CleanupInfo(SSTableReader sstable, ICompactionScanner scanner)
         {
             this.sstable = sstable;
             this.scanner = scanner;


Mime
View raw message