You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2009/10/12 21:05:40 UTC

svn commit: r824458 - in /incubator/cassandra/branches/cassandra-0.4: CHANGES.txt src/java/org/apache/cassandra/service/ConsistencyManager.java

Author: jbellis
Date: Mon Oct 12 19:05:40 2009
New Revision: 824458

URL: http://svn.apache.org/viewvc?rev=824458&view=rev
Log:
fix race condition in ResponseVerbHandler.  patch by jbellis; reviewed by eevans for CASSANDRA-478

Modified:
    incubator/cassandra/branches/cassandra-0.4/CHANGES.txt
    incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/service/ConsistencyManager.java

Modified: incubator/cassandra/branches/cassandra-0.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.4/CHANGES.txt?rev=824458&r1=824457&r2=824458&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.4/CHANGES.txt (original)
+++ incubator/cassandra/branches/cassandra-0.4/CHANGES.txt Mon Oct 12 19:05:40 2009
@@ -8,6 +8,7 @@
  * Add SnapshotBeforeCompaction configuration option (CASSANDRA-426)
  * Fix compaction abort under insufficient disk space (CASSANDRA-473)
  * Fix reading subcolumn slice from tombstoned CF (CASSANDRA-484)
+ * Fix race condition in RVH causing occasional NPE (CASSANDRA-478)
 
 
 0.4.0

Modified: incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/service/ConsistencyManager.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/service/ConsistencyManager.java?rev=824458&r1=824457&r2=824458&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/service/ConsistencyManager.java (original)
+++ incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/service/ConsistencyManager.java Mon Oct 12 19:05:40 2009
@@ -48,7 +48,7 @@
 	{
 		List<Message> responses_ = new ArrayList<Message>();
 		
-		public void response(Message msg)
+		public synchronized void response(Message msg)
 		{
 			responses_.add(msg);
 			if ( responses_.size() == ConsistencyManager.this.replicas_.size() )