svn commit: r1157225 - in /cassandra/branches/cassandra-0.8: CHANGES.txt src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java

[jbellis]

Author: jbellis
Date: Fri Aug 12 19:28:35 2011
New Revision: 1157225

URL: http://svn.apache.org/viewvc?rev=1157225&view=rev
Log:
fix NPE when debug logging is enabled and dropped CF is present
patch by fantayeneh gizaw; reviewed by jbellis for CASSANDRA-3021

Modified:
    cassandra/branches/cassandra-0.8/CHANGES.txt
    
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1157225&r1=1157224&r2=1157225&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Fri Aug 12 19:28:35 2011
@@ -3,6 +3,8 @@
  * include column name in validation failure exceptions (CASSANDRA-2849)
  * make sure truncate clears out the commitlog so replay won't re-
    populate with truncated data (CASSANDRA-2950)
+ * fix NPE when debug logging is enabled and dropped CF is present
+   in a commitlog segment (CASSANDRA-3021)
 
 
 0.8.4

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java?rev=1157225&r1=1157224&r2=1157225&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
 Fri Aug 12 19:28:35 2011
@@ -212,7 +212,7 @@ public class CommitLogSegment
         for (Integer cfId : cfLastWrite.keySet())
         {
             CFMetaData m = DatabaseDescriptor.getCFMetaData(cfId);
-            sb.append(m == null ? m.cfName : "<deleted>").append(" 
(").append(cfId).append("), ");
+            sb.append(m == null ? "<deleted>" : m.cfName).append(" 
(").append(cfId).append("), ");
         }
         return sb.toString();
     }