You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2015/05/08 21:59:54 UTC
[1/2] cassandra git commit: make sure lock gets unlocked
Repository: cassandra
Updated Branches:
refs/heads/trunk e25157901 -> 81c93084b
make sure lock gets unlocked
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b66475c4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b66475c4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b66475c4
Branch: refs/heads/trunk
Commit: b66475c4e0b7eb39e0225bbb69a67eff6e6405f8
Parents: 9e9846e
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri May 8 15:58:54 2015 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri May 8 15:58:54 2015 -0400
----------------------------------------------------------------------
tools/stress/src/org/apache/cassandra/stress/util/DynamicList.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b66475c4/tools/stress/src/org/apache/cassandra/stress/util/DynamicList.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/util/DynamicList.java b/tools/stress/src/org/apache/cassandra/stress/util/DynamicList.java
index e9d43a3..e2bdd4e 100644
--- 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
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/81c93084
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/81c93084
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/81c93084
Branch: refs/heads/trunk
Commit: 81c93084ba482508cb66c45bf7f19c07a35605a0
Parents: e251579 b66475c
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri May 8 15:59:37 2015 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri May 8 15:59:37 2015 -0400
----------------------------------------------------------------------
tools/stress/src/org/apache/cassandra/stress/util/DynamicList.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------