You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2016/02/29 16:33:43 UTC
[1/2] cassandra git commit: Don't NPE when using forceRepairRangeAsync
Repository: cassandra
Updated Branches:
refs/heads/trunk 1fce64843 -> 0b76ef07d
Don't NPE when using forceRepairRangeAsync
Patch by Nick Bailey; reviewed by Paulo Motta for CASSANDRA-11239
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0a353416
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0a353416
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0a353416
Branch: refs/heads/trunk
Commit: 0a35341675c6c2026113736f9447f08069b6eb83
Parents: 8fc1b28
Author: Nick Bailey <ni...@gmail.com>
Authored: Thu Feb 25 13:39:14 2016 -0600
Committer: T Jake Luciani <ja...@apache.org>
Committed: Mon Feb 29 10:31:40 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a353416/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2dacd3a..ba3d2fd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -18,6 +18,7 @@
* Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001)
* Add dropped_columns to the list of schema table so it gets handled
properly (CASSANDRA-11050)
+ * Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
Merged from 2.2:
* Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
* Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a353416/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 185c988..164c419 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -3081,7 +3081,10 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
Collection<Range<Token>> repairingRange = createRepairRangeFrom(beginToken, endToken);
RepairOption options = new RepairOption(parallelism, false, !fullRepair, false, 1, repairingRange, true);
- options.getDataCenters().addAll(dataCenters);
+ if (dataCenters != null)
+ {
+ options.getDataCenters().addAll(dataCenters);
+ }
if (hosts != null)
{
options.getHosts().addAll(hosts);
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-3.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/0b76ef07
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b76ef07
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b76ef07
Branch: refs/heads/trunk
Commit: 0b76ef07da8a1b79f69820efc2482a0ca9a4d78e
Parents: 1fce648 0a35341
Author: T Jake Luciani <ja...@apache.org>
Authored: Mon Feb 29 10:32:44 2016 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Mon Feb 29 10:32:44 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b76ef07/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b76ef07/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------