1 files changed, 7 insertions, 11 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
index a0f5f9fa4c..7197ec8cdc 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
@@ -108,6 +108,7 @@ public class ServerConfiguration extends ConfigurationPlugin implements SignalHa
         envVarMap.put("QPID_MAXIMUMMESSAGECOUNT", "maximumMessageCount");
         envVarMap.put("QPID_MAXIMUMQUEUEDEPTH", "maximumQueueDepth");
         envVarMap.put("QPID_MAXIMUMMESSAGESIZE", "maximumMessageSize");
+        envVarMap.put("QPID_MAXIMUMCHANNELCOUNT", "maximumChannelCount");
         envVarMap.put("QPID_MINIMUMALERTREPEATGAP", "minimumAlertRepeatGap");
         envVarMap.put("QPID_QUEUECAPACITY", "capacity");
         envVarMap.put("QPID_FLOWRESUMECAPACITY", "flowResumeCapacity");
@@ -212,7 +213,7 @@ public class ServerConfiguration extends ConfigurationPlugin implements SignalHa
      * both, as a fix for QPID-2360 and QPID-2361.
      */
     @SuppressWarnings("unchecked")
-    private void setupVirtualHosts(Configuration conf) throws ConfigurationException
+    protected void setupVirtualHosts(Configuration conf) throws ConfigurationException
     {
         List<String> vhostFiles = conf.getList("virtualhosts");
         Configuration vhostConfig = conf.subset("virtualhosts");
@@ -704,16 +705,6 @@ public class ServerConfiguration extends ConfigurationPlugin implements SignalHa
         return getBooleanValue("advanced.filterchain[@enableExecutorPool]");
     }
 
-    public boolean getEnablePooledAllocator()
-    {
-        return getBooleanValue("advanced.enablePooledAllocator");
-    }
-
-    public boolean getEnableDirectBuffers()
-    {
-        return getBooleanValue("advanced.enableDirectBuffers");
-    }
-
     public boolean getEnableSSL()
     {
         return getBooleanValue("connector.ssl.enabled");
@@ -828,4 +819,9 @@ public class ServerConfiguration extends ConfigurationPlugin implements SignalHa
             }
         };
     }
+
+    public int getMaxChannelCount()
+    {
+        return getIntValue("maximumChannelCount", 256);
+    }
 }