fix broken merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aefa20d0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aefa20d0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aefa20d0 Branch: refs/heads/trunk Commit: aefa20d0fe2360ab9ee8db6d2c535f5eed498669 Parents: 96c0256 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Oct 17 13:22:18 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Oct 17 13:22:18 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/aefa20d0/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 ead9654..0d6e1fb 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -267,6 +267,8 @@ public class DatabaseDescriptor /* Local IP or hostname to bind services to */ if (conf.listen_address != null) { + if (conf.listen_address.equals("0.0.0.0")) + throw new ConfigurationException("listen_address cannot be 0.0.0.0!"); try { listenAddress = InetAddress.getByName(conf.listen_address); @@ -276,8 +278,6 @@ public class DatabaseDescriptor throw new ConfigurationException("Unknown listen_address '" + conf.listen_address + "'"); } } - if (conf.listen_address.equals("0.0.0.0")) - throw new ConfigurationException("listen_address cannot be 0.0.0.0!"); try {