You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2016/03/07 19:50:27 UTC
[05/15] cassandra git commit: Unresolved hostname leads to replace
being ignored
Unresolved hostname leads to replace being ignored
patch by Jan Karlsson, reviewed by Sankalp Kohli for CASSANDRA-11210
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad8673cc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad8673cc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad8673cc
Branch: refs/heads/trunk
Commit: ad8673cc6b021e9dac188cfc3ec18ea6f9c0bfdc
Parents: 66fa1d4
Author: Jason Brown <ja...@gmail.com>
Authored: Mon Mar 7 05:34:24 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Mon Mar 7 05:34:24 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad8673cc/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4c21d66..9699bfd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -63,6 +63,7 @@ Merged from 3.0:
properly (CASSANDRA-11050)
* Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
Merged from 2.2:
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
* Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
* 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/ad8673cc/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 7057c37..b917aec 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -1016,7 +1016,7 @@ public class DatabaseDescriptor
}
catch (UnknownHostException e)
{
- return null;
+ throw new RuntimeException("Replacement host name could not be resolved or scope_id was specified for a global IPv6 address", e);
}
}