From 903bfd2668a38cef8417c6ef11471ea6c6ca7699 Mon Sep 17 00:00:00 2001
From: Eric Evans <eevans@apache.org>
Date: Mon, 12 Oct 2009 17:34:24 +0000
Subject: [PATCH 1/2] updated versioning information in preparation for point
 release

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.4@824433 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                                                  | 2 +-
 src/java/org/apache/cassandra/service/CassandraServer.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index e28d822583..465aef74b2 100644
--- a/build.xml
+++ b/build.xml
@@ -37,7 +37,7 @@
     <property name="test.name" value="*Test"/>
     <property name="test.unit.src" value="${test.dir}/unit"/>
     <property name="dist.dir" value="${build.dir}/dist"/>
-    <property name="version" value="0.4.0"/>
+    <property name="version" value="0.4.1"/>
     <property name="final.name" value="${ant.project.name}-${version}"/>
 
     <!-- http://cobertura.sourceforge.net/ -->
diff --git a/src/java/org/apache/cassandra/service/CassandraServer.java b/src/java/org/apache/cassandra/service/CassandraServer.java
index 96ea527de8..6dfbf4c01e 100644
--- a/src/java/org/apache/cassandra/service/CassandraServer.java
+++ b/src/java/org/apache/cassandra/service/CassandraServer.java
@@ -511,7 +511,7 @@ public class CassandraServer implements Cassandra.Iface
         }
         else if (propertyName.equals("version"))
         {
-            return "0.4.0";
+            return "0.4.1";
         }
         else
         {

From 4b6b4cb6af8369c11eb8c5f001fb2cd9ad98f481 Mon Sep 17 00:00:00 2001
From: Jonathan Ellis <jbellis@apache.org>
Date: Mon, 12 Oct 2009 19:05:40 +0000
Subject: [PATCH 2/2] fix race condition in ResponseVerbHandler.  patch by
 jbellis; reviewed by eevans for CASSANDRA-478

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.4@824458 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                                   | 1 +
 src/java/org/apache/cassandra/service/ConsistencyManager.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index ab85ea9e55..63a97d40f7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -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
diff --git a/src/java/org/apache/cassandra/service/ConsistencyManager.java b/src/java/org/apache/cassandra/service/ConsistencyManager.java
index 69c3296bdd..226144952a 100644
--- a/src/java/org/apache/cassandra/service/ConsistencyManager.java
+++ b/src/java/org/apache/cassandra/service/ConsistencyManager.java
@@ -48,7 +48,7 @@ class ConsistencyManager implements Runnable
 	{
 		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() )