Repository: cassandra Updated Branches: refs/heads/trunk 9e9161b79 -> 4ecd8542d
Make CSM.getStrategies() public again after CASSANDRA-10099 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4ecd8542 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ecd8542 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4ecd8542 Branch: refs/heads/trunk Commit: 4ecd8542d7bbc8b9f613cc58c3e2ffe51df4937a Parents: 9e9161b Author: Marcus Eriksson <marc...@apache.org> Authored: Wed Mar 16 15:29:08 2016 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Wed Mar 16 15:33:10 2016 +0100 ---------------------------------------------------------------------- .../db/compaction/CompactionStrategyManager.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ecd8542/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java index 1d387dc..d69d1ed 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java @@ -766,10 +766,17 @@ public class CompactionStrategyManager implements INotificationConsumer } } - @VisibleForTesting - List<List<AbstractCompactionStrategy>> getStrategies() + public List<List<AbstractCompactionStrategy>> getStrategies() { - return Arrays.asList(repaired, unrepaired); + readLock.lock(); + try + { + return Arrays.asList(repaired, unrepaired); + } + finally + { + readLock.unlock(); + } } public void setNewLocalCompactionStrategy(CompactionParams params)
