[accumulo] branch 1.9 updated: Fix #1532 Remove need for Ant on class path

[ctubbsii]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.9 by this push:
     new 3779cf9  Fix #1532 Remove need for Ant on class path
3779cf9 is described below

commit 3779cf9de0a286d951f0bd92553edb345f1ada8e
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Thu Feb 27 14:32:32 2020 -0500

    Fix #1532 Remove need for Ant on class path
    
    Make MetricsConfiguration use a MapConfiguration with System.getenv()
    rather than EnvironmentConfiguration, to get the environment properties.
    EnvironmentConfiguration uses Ant code, which is not available on the
    class path (typically) to get the environment, so it should be avoided.
---
 .../org/apache/accumulo/server/metrics/MetricsConfiguration.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsConfiguration.java
 
b/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsConfiguration.java
index b1f470e..9db36fb 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsConfiguration.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsConfiguration.java
@@ -22,7 +22,7 @@ import org.apache.accumulo.core.util.Daemon;
 import org.apache.commons.configuration.AbstractFileConfiguration;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.EnvironmentConfiguration;
+import org.apache.commons.configuration.MapConfiguration;
 import org.apache.commons.configuration.SystemConfiguration;
 import org.apache.commons.configuration.XMLConfiguration;
 import org.apache.commons.configuration.event.ConfigurationEvent;
@@ -44,7 +44,7 @@ public class MetricsConfiguration {
 
   private static SystemConfiguration sysConfig = null;
 
-  private static EnvironmentConfiguration envConfig = null;
+  private static MapConfiguration envConfig = null;
 
   private XMLConfiguration xConfig = null;
 
@@ -111,7 +111,7 @@ public class MetricsConfiguration {
   public Configuration getEnvironmentConfiguration() {
     synchronized (MetricsConfiguration.class) {
       if (null == envConfig)
-        envConfig = new EnvironmentConfiguration();
+        envConfig = new MapConfiguration(System.getenv());
       return envConfig;
     }
   }