Author: jbellis Date: Fri Jun 24 14:20:01 2011 New Revision: 1139317 URL: http://svn.apache.org/viewvc?rev=1139317&view=rev Log: avoid NPE in debug logging when deleted CF is dirty patch by jbellis
Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java 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=1139317&r1=1139316&r2=1139317&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 Jun 24 14:20:01 2011 @@ -30,6 +30,7 @@ import java.util.regex.Pattern; import java.util.zip.CRC32; import java.util.zip.Checksum; +import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.net.MessagingService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -182,7 +183,10 @@ public class CommitLogSegment { StringBuilder sb = new StringBuilder(); for (Integer cfId : cfDirty) - sb.append(DatabaseDescriptor.getCFMetaData(cfId).cfName).append(" (").append(cfId).append("), "); + { + CFMetaData m = DatabaseDescriptor.getCFMetaData(cfId); + sb.append(m == null ? m.cfName : "<deleted>").append(" (").append(cfId).append("), "); + } return sb.toString(); }