Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 935D0114A9 for ; Fri, 23 May 2014 20:30:44 +0000 (UTC) Received: (qmail 44298 invoked by uid 500); 23 May 2014 20:30:44 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 44190 invoked by uid 500); 23 May 2014 20:30:44 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 44181 invoked by uid 99); 23 May 2014 20:30:44 -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, 23 May 2014 20:30:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4C4429A3280; Fri, 23 May 2014 20:30:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kturner@apache.org To: commits@accumulo.apache.org Date: Fri, 23 May 2014 20:30:46 -0000 Message-Id: <5c25f09c945841e2afe7863bb93fdb89@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/4] git commit: ACCUMULO-2838 use resolved props ACCUMULO-2838 use resolved props Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/850f4bc0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/850f4bc0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/850f4bc0 Branch: refs/heads/master Commit: 850f4bc04ac910526c7c9cae3d8424ccb55a5d8e Parents: 2bf3ebb Author: Keith Turner Authored: Fri May 23 11:45:58 2014 -0400 Committer: Keith Turner Committed: Fri May 23 16:27:25 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/conf/DefaultConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/850f4bc0/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java b/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java index 847fd02..44e198a 100644 --- a/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java @@ -39,7 +39,7 @@ public class DefaultConfiguration extends AccumuloConfiguration { @Override public String get(Property property) { - return property.getDefaultValue(); + return getResolvedProps().get(property.getKey()); } private synchronized Map getResolvedProps() {