Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3F90D119A6 for ; Fri, 22 Aug 2014 23:08:11 +0000 (UTC) Received: (qmail 56836 invoked by uid 500); 22 Aug 2014 23:08:11 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 56801 invoked by uid 500); 22 Aug 2014 23:08:11 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 56786 invoked by uid 99); 22 Aug 2014 23:08:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Aug 2014 23:08:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9E8399C8DA5; Fri, 22 Aug 2014 23:08:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: remove dead local Date: Fri, 22 Aug 2014 23:08:10 +0000 (UTC) Repository: cassandra Updated Branches: refs/heads/trunk 209d1dbd9 -> 0ce9abd78 remove dead local Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ce9abd7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ce9abd7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ce9abd7 Branch: refs/heads/trunk Commit: 0ce9abd78c8712ad4fba28734214b18f617a2aac Parents: 209d1db Author: Dave Brosius Authored: Fri Aug 22 19:07:15 2014 -0400 Committer: Dave Brosius Committed: Fri Aug 22 19:07:15 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/YamlConfigurationLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ce9abd7/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java index 174dd15..50991f2 100644 --- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java +++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java @@ -79,6 +79,7 @@ public class YamlConfigurationLoader implements ConfigurationLoader return url; } + @Override public Config loadConfig() throws ConfigurationException { return loadConfig(getStorageConfigURL()); @@ -86,7 +87,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader public Config loadConfig(URL url) throws ConfigurationException { - InputStream input = null; try { logger.info("Loading settings from {}", url);