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/03/07 14:37:04 UTC
[03/10] 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/a956e9fe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a956e9fe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a956e9fe
Branch: refs/heads/cassandra-3.5
Commit: a956e9fe0c1172241892d9e80cb23b12a19a8419
Parents: 90fd8de
Author: Jason Brown <ja...@gmail.com>
Authored: Mon Mar 7 05:27:58 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Mon Mar 7 05:27:58 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/a956e9fe/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5631a28..a6d6a14 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
* Fix filtering on non-primary key columns for thrift static column families
(CASSANDRA-6377)
* Only log yaml config once, at startup (CASSANDRA-11217)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a956e9fe/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 cbea2ff..afae298 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -912,7 +912,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);
}
}