You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/05/28 22:51:47 UTC

[14/32] 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/ACCUMULO-378
Commit: 850f4bc04ac910526c7c9cae3d8424ccb55a5d8e
Parents: 2bf3ebb
Author: Keith Turner <kt...@apache.org>
Authored: Fri May 23 11:45:58 2014 -0400
Committer: Keith Turner <kt...@apache.org>
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<String,String> getResolvedProps() {