Repository: cassandra Updated Branches: refs/heads/trunk eb60f3101 -> 5746f602f
Fix potential StackOverflow when setting CrcCheckChance over JMX Patch by tjake; reviewed by Ariel Weisberg for CASSANDRA-9488 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04eba909 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04eba909 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04eba909 Branch: refs/heads/trunk Commit: 04eba90949a674cff21756ade74d9fef3f4878c5 Parents: d075540 Author: T Jake Luciani <[email protected]> Authored: Wed May 27 16:15:06 2015 -0400 Committer: T Jake Luciani <[email protected]> Committed: Wed May 27 16:15:06 2015 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/io/compress/CompressionParameters.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/04eba909/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 054cf79..58f3c53 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.16: + * Fix potential StackOverflow when setting CrcCheckChance over JMX (CASSANDRA-9488) * Fix null static columns in pages after the first, paged reversed queries (CASSANDRA-8502) * Fix failing bound statement after adding a collection (CASSANDRA-9411) http://git-wip-us.apache.org/repos/asf/cassandra/blob/04eba909/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 cf16711..2ca99f5 100644 --- a/src/java/org/apache/cassandra/io/compress/CompressionParameters.java +++ b/src/java/org/apache/cassandra/io/compress/CompressionParameters.java @@ -116,7 +116,7 @@ public class CompressionParameters validateCrcCheckChance(crcCheckChance); this.crcCheckChance = crcCheckChance; - if (liveMetadata != null) + if (liveMetadata != null && this != liveMetadata.compressionParameters) liveMetadata.compressionParameters.setCrcCheckChance(crcCheckChance); }
