Merge branch 'cassandra-2.1' into trunk

2015-05-08 15:59:37 -04:00 · 2015-05-08 15:59:37 -04:00 · 81c93084ba
parent e25157901b b66475c4e0
commit 81c93084ba
1 changed files with 1 additions and 1 deletions
--- a/tools/stress/src/org/apache/cassandra/stress/util/DynamicList.java
+++ b/tools/stress/src/org/apache/cassandra/stress/util/DynamicList.java
@ -153,10 +153,10 @@ public class DynamicList<E>
    public void remove(Node<E> node)
    {
        lock.writeLock().lock();
-        assert node.value != null;
        node.value = null;
        try
        {
+            assert node.value != null;
            size--;

            // go up through each level in the skip list, unlinking this node; this entails