cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r1053407 - /cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java
Date Tue, 28 Dec 2010 19:08:04 GMT
Author: jbellis
Date: Tue Dec 28 19:08:04 2010
New Revision: 1053407

URL: http://svn.apache.org/viewvc?rev=1053407&view=rev
Log:
clean up counter code in RRR
patch by jbellis

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java?rev=1053407&r1=1053406&r2=1053407&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java Tue Dec
28 19:08:04 2010
@@ -100,14 +100,15 @@ public class ReadResponseResolver implem
             {
                 ColumnFamily cf = result.row().cf;
                 InetAddress from = message.getFrom();
-                
-                if(cf != null) {
+
+                if (cf != null)
+                {
                     AbstractType defaultValidator = cf.metadata().getDefaultValidator();
-                    if (!FBUtilities.getLocalAddress().equals(from) && cf != null
&& defaultValidator.isCommutative())
+                    if (!FBUtilities.getLocalAddress().equals(from) && defaultValidator.isCommutative())
                     {
                         cf = cf.cloneMe();
-                        ((AbstractCommutativeType)defaultValidator).cleanContext(cf, FBUtilities.getLocalAddress());
-                    }                   
+                        ((AbstractCommutativeType) defaultValidator).cleanContext(cf, FBUtilities.getLocalAddress());
+                    }
                 }
                 versions.add(cf);
                 endpoints.add(from);



Mime
View raw message