Merge branch 'cassandra-2.1' into trunk

2015-05-08 16:09:04 -04:00 · 2015-05-08 16:09:04 -04:00 · 2da468d9bb
parent 81c93084ba def6b5fa19
commit 2da468d9bb
1 changed files with 2 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,11 @@ public class DynamicList<E>
    public void remove(Node<E> node)
    {
        lock.writeLock().lock();
-        node.value = null;
        try
        {
            assert node.value != null;
+            node.value = null;
+
            size--;

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