svn commit: r1049648 - in /cassandra/branches/cassandra-0.6: CHANGES.txt src/java/org/apache/cassandra/service/StorageProxy.java

[jbellis]

Author: jbellis
Date: Wed Dec 15 17:42:38 2010
New Revision: 1049648

URL: http://svn.apache.org/viewvc?rev=1049648&view=rev
Log:
backport CASSANDRA-1862 from 0.7

Modified:
    cassandra/branches/cassandra-0.6/CHANGES.txt
    
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java

Modified: cassandra/branches/cassandra-0.6/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=1049648&r1=1049647&r2=1049648&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.6/CHANGES.txt Wed Dec 15 17:42:38 2010
@@ -19,6 +19,8 @@
  * correct ordering of drain operations so CL.recover is no longer necessary
    (CASSANDRA-1408)
  * ReadResponseResolver check digests against each other (CASSANDRA-1830)
+ * change exception for read requests during bootstrap from 
+   InvalidRequest to Unavailable (CASSANDRA-1862)
 
 
 0.6.8

Modified: 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java?rev=1049648&r1=1049647&r2=1049648&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java
 (original)
+++ 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java
 Wed Dec 15 17:42:38 2010
@@ -339,7 +339,7 @@ public class StorageProxy implements Sto
             throws IOException, UnavailableException, TimeoutException, 
InvalidRequestException
     {
         if (StorageService.instance.isBootstrapMode())
-            throw new InvalidRequestException("This node cannot accept reads 
until it has bootstrapped");
+            throw new UnavailableException();
         long startTime = System.nanoTime();
 
         List<Row> rows;