QPID-4390: remove dead code, method was only ever called with null envVarMap arg

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1454939 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 2 insertions, 20 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
index eada676b65..e4ea16fc5b 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
@@ -66,7 +66,7 @@ public class VirtualHostConfiguration extends AbstractConfiguration
         }
         else
         {
-            Configuration virtualHostConfig = XmlConfigurationUtilities.parseConfig(configurationFile, null);
+            Configuration virtualHostConfig = XmlConfigurationUtilities.parseConfig(configurationFile);
 
             // check if it is an old virtual host configuration file which has an element of the same name as virtual host
             Configuration config = virtualHostConfig.subset("virtualhost." + XmlConfigurationUtilities.escapeTagName(name));
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/XmlConfigurationUtilities.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/XmlConfigurationUtilities.java
index c0cff2c109..84972c1e0a 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/XmlConfigurationUtilities.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/XmlConfigurationUtilities.java
@@ -45,7 +45,7 @@ public class XmlConfigurationUtilities
         }
     }
 
-    public static Configuration parseConfig(File file, Map<String, String> envVarMap) throws ConfigurationException
+    public static Configuration parseConfig(File file) throws ConfigurationException
     {
         ConfigurationFactory factory = new ConfigurationFactory();
         factory.setConfigurationFileName(file.getAbsolutePath());
@@ -58,7 +58,6 @@ public class XmlConfigurationUtilities
             conf = flatConfig(file);
         }
 
-        XmlConfigurationUtilities.substituteEnvironmentVariables(conf, envVarMap);
         return conf;
     }
 
@@ -87,23 +86,6 @@ public class XmlConfigurationUtilities
         return conf;
     }
 
-    static void substituteEnvironmentVariables(Configuration conf, Map<String, String> envVarMap)
-    {
-        if (envVarMap == null || envVarMap.isEmpty())
-        {
-            return;
-        }
-        for (Entry<String, String> var : envVarMap.entrySet())
-        {
-            String val = System.getenv(var.getKey());
-            if (val != null)
-            {
-                conf.setProperty(var.getValue(), val);
-            }
-        }
-    }
-
-
     public static String escapeTagName(String name)
     {
         return name.replaceAll("\\.", "\\.\\.");