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 2011/09/22 23:07:32 UTC

svn commit: r1174392 - in /cassandra/branches/cassandra-0.8: CHANGES.txt src/java/org/apache/cassandra/cache/AutoSavingCache.java

Author: jbellis
Date: Thu Sep 22 21:07:32 2011
New Revision: 1174392

URL: http://svn.apache.org/viewvc?rev=1174392&view=rev
Log:
Don't allow any cache loading exceptions to halt startup
patch by Eldon Stegall; reviewed by jbellis for CASSANDRA-3218

Modified:
    cassandra/branches/cassandra-0.8/CHANGES.txt
    cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/AutoSavingCache.java

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1174392&r1=1174391&r2=1174392&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Thu Sep 22 21:07:32 2011
@@ -2,6 +2,7 @@
  * Kill server on wrapped OOME such as from FileChannel.map (CASSANDRA-3201)
  * Allow using quotes in "USE <keyspace>;" CLI command (CASSANDRA-3208)
  * Log message when a full repair operation completes (CASSANDRA-3207)
+ * Don't allow any cache loading exceptions to halt startup (CASSANDRA-3218)
 
 
 0.8.6

Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/AutoSavingCache.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/AutoSavingCache.java?rev=1174392&r1=1174391&r2=1174392&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/AutoSavingCache.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/AutoSavingCache.java Thu Sep 22 21:07:32 2011
@@ -147,9 +147,9 @@ public abstract class AutoSavingCache<K,
                     logger.debug(String.format("completed reading (%d ms; %d keys) saved cache %s",
                                                System.currentTimeMillis() - start, keys.size(), path));
             }
-            catch (IOException ioe)
+            catch (Exception e)
             {
-                logger.warn(String.format("error reading saved cache %s", path.getAbsolutePath()), ioe);
+                logger.warn(String.format("error reading saved cache %s", path.getAbsolutePath()), e);
             }
             finally
             {