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 22:09:31 UTC
[1/2] cassandra git commit: fixup last fix for bad lock guard
Repository: cassandra
Updated Branches:
refs/heads/trunk 81c93084b -> 2da468d9b
fixup last fix for bad lock guard
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/def6b5fa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/def6b5fa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/def6b5fa
Branch: refs/heads/trunk
Commit: def6b5fa19c27d74bc69710b4e26d74dde9dd609
Parents: b66475c
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri May 8 16:08:36 2015 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri May 8 16:08:36 2015 -0400
----------------------------------------------------------------------
.../stress/src/org/apache/cassandra/stress/util/DynamicList.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/def6b5fa/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 e2bdd4e..ee04063 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,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
[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/2da468d9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2da468d9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2da468d9
Branch: refs/heads/trunk
Commit: 2da468d9bbcf66a0635fb39d26da83d7349829a8
Parents: 81c9308 def6b5f
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri May 8 16:09:04 2015 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri May 8 16:09:04 2015 -0400
----------------------------------------------------------------------
.../stress/src/org/apache/cassandra/stress/util/DynamicList.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------