svn commit: r933248 - in /cassandra/trunk/src/java/org/apache/cassandra: db/ColumnFamilyStore.java service/AntiEntropyService.java

[jb...@apache.org]

Author: jbellis
Date: Mon Apr 12 14:10:26 2010
New Revision: 933248

URL: http://svn.apache.org/viewvc?rev=933248&view=rev
Log:
access static members by class name.  patch by Tupshin Harper; reviewed by jbellis for CASSANDRA-966

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
    cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=933248&r1=933247&r2=933248&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Mon Apr 12 14:10:26 2010
@@ -796,7 +796,7 @@ public class ColumnFamilyStore implement
                 iterators.add(iter);
             }
 
-            Comparator<IColumn> comparator = filter.getColumnComparator(getComparator());
+            Comparator<IColumn> comparator = QueryFilter.getColumnComparator(getComparator());
             Iterator collated = IteratorUtils.collatedIterator(comparator, iterators);
             if (!collated.hasNext())
                 return null;

Modified: cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java?rev=933248&r1=933247&r2=933248&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java Mon Apr 12 14:10:26 2010
@@ -554,9 +554,9 @@ public class AntiEntropyService
 
             // restore partitioners (in case we were serialized)
             if (ltree.partitioner() == null)
-                ltree.partitioner(ss.getPartitioner());
+                ltree.partitioner(StorageService.getPartitioner());
             if (rtree.partitioner() == null)
-                rtree.partitioner(ss.getPartitioner());
+                rtree.partitioner(StorageService.getPartitioner());
 
             // determine the ranges where responsibility overlaps
             Set<Range> interesting = new HashSet(ss.getRangesForEndPoint(cf.left, local));