From 04eba90949a674cff21756ade74d9fef3f4878c5 Mon Sep 17 00:00:00 2001 From: T Jake Luciani Date: Wed, 27 May 2015 16:15:06 -0400 Subject: [PATCH] Fix potential StackOverflow when setting CrcCheckChance over JMX Patch by tjake; reviewed by Ariel Weisberg for CASSANDRA-9488 --- CHANGES.txt | 1 + .../org/apache/cassandra/io/compress/CompressionParameters.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 054cf79553..58f3c53d9f 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) diff --git a/src/java/org/apache/cassandra/io/compress/CompressionParameters.java b/src/java/org/apache/cassandra/io/compress/CompressionParameters.java index cf167116f3..2ca99f5e4c 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); }