From 4eeef21b55da41524ac5bde489be7c1371aa85e6 Mon Sep 17 00:00:00 2001 From: Gary Spencer Date: Tue, 9 Mar 2010 09:49:02 +0000 Subject: [PATCH] Merge 3.2 to HEAD: 17444: (record-only) 18955: If CIFS is not enabled then do not create the thread/memory pools during startup. ALF-585. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19138 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/filesys/config/ServerConfigurationBean.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java b/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java index 07dd1ec097..f11e71fa05 100644 --- a/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java +++ b/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java @@ -1793,6 +1793,11 @@ public class ServerConfigurationBean extends AbstractServerConfigurationBean CoreServerConfigSection coreConfig = new CoreServerConfigSection(this); + // Check if the CIFS server is not enabled, do not create the thread/memory pools + + if ( cifsConfigBean == null || cifsConfigBean.getServerEnabled() == false) + return; + // Check if the server core element has been specified if (coreServerConfigBean == null)