You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/09/17 09:12:01 UTC
[1/3] git commit: Fix NPE during sstablesplit
Updated Branches:
refs/heads/trunk 975df2eda -> 7906851f0
Fix NPE during sstablesplit
patch by slebresne; reviewed by brandon.williams for CASSANDRA-6026
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0804b761
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0804b761
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0804b761
Branch: refs/heads/trunk
Commit: 0804b76100c8e01df46918818a31fb496ed79368
Parents: 742e5ba
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Sep 17 09:09:36 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Sep 17 09:09:36 2013 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0804b761/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java b/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
index 8bdc733..d02efd8 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
@@ -67,7 +67,8 @@ public class SSTableDeletingTask implements Runnable
public void run()
{
- tracker.notifyDeleting(referent);
+ if (tracker != null)
+ tracker.notifyDeleting(referent);
// If we can't successfully delete the DATA component, set the task to be retried later: see above
File datafile = new File(desc.filenameFor(Component.DATA));
[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by sl...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef7abacf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef7abacf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef7abacf
Branch: refs/heads/trunk
Commit: ef7abacfc1a003d4129221db97e8d5cbb57a47ff
Parents: a2824e6 0804b76
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Sep 17 09:11:36 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Sep 17 09:11:36 2013 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef7abacf/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
----------------------------------------------------------------------
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7906851f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7906851f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7906851f
Branch: refs/heads/trunk
Commit: 7906851f056c1d61c78ac7ce785b1dc2d24d2a08
Parents: 975df2e ef7abac
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Sep 17 09:11:54 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Sep 17 09:11:54 2013 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------