Author: jbellis
Date: Fri Feb 11 16:43:24 2011
New Revision: 1069879
URL: http://svn.apache.org/viewvc?rev=1069879&view=rev
Log:
fix merge
patch by slebresne; reviewed by jbellis for CASSANDRA-2155
Modified:
cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
Modified:
cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java?rev=1069879&r1=1069878&r2=1069879&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java Fri
Feb 11 16:43:24 2011
@@ -222,7 +222,8 @@ public class StorageProxy implements Sto
// unhinted writes
if (destination.equals(FBUtilities.getLocalAddress()))
{
- insertLocal(rm, responseHandler);
+ if (insertLocalMessages)
+ insertLocal(rm, responseHandler);
}
else
{
