cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [1/2] cassandra git commit: Fix NPE after dropping a keyspace
Date Fri, 12 Dec 2014 14:14:47 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 6c579a010 -> cd714a1de


Fix NPE after dropping a keyspace

Patch by tjake; reviewed by Chris Lohfink for CASSANDRA-8332


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac9cfbd9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac9cfbd9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac9cfbd9

Branch: refs/heads/cassandra-2.1
Commit: ac9cfbd9aeb91c3391d78724fe8cb1e49ada55aa
Parents: 451c514
Author: T Jake Luciani <jake@apache.org>
Authored: Fri Dec 12 09:10:33 2014 -0500
Committer: T Jake Luciani <jake@apache.org>
Committed: Fri Dec 12 09:10:33 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                       | 1 +
 .../org/apache/cassandra/io/compress/CompressionParameters.java   | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac9cfbd9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index cd302fb..c25caf9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.12:
+ * Fix NPE after dropping a keyspace (CASSANDRA-8332)
  * Fix error message on read repair timeouts (CASSANDRA-7947)
  * Default DTCS base_time_seconds changed to 60 (CASSANDRA-8417)
  * Refuse Paxos operation with more than one pending endpoint (CASSANDRA-8346)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac9cfbd9/src/java/org/apache/cassandra/io/compress/CompressionParameters.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/compress/CompressionParameters.java b/src/java/org/apache/cassandra/io/compress/CompressionParameters.java
index 2df64b4..98f01d4 100644
--- a/src/java/org/apache/cassandra/io/compress/CompressionParameters.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressionParameters.java
@@ -105,6 +105,9 @@ public class CompressionParameters
 
     public void setLiveMetadata(final CFMetaData liveMetadata)
     {
+        if (liveMetadata == null)
+            return;
+
         assert this.liveMetadata == null || this.liveMetadata == liveMetadata;
         this.liveMetadata = liveMetadata;
     }


Mime
View raw message