From f2d52228ecee3e173b4aa1f78c0d7b525825b971 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 6 Sep 2013 07:19:22 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX to HEAD (4.2) 54964: Reverse merged as it cause a compilation error. Config structures have chnaged between 4.1 and 4.2 54931: MNT-9576: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2) 54563: MNT-9461 - CIFS Clustering not Working in alfresco 4.1.5 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55017 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/filesys/config/ServerConfigurationBean.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java b/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java index 9415818ab6..4a33a4b945 100644 --- a/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java +++ b/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java @@ -2375,8 +2375,7 @@ public class ServerConfigurationBean extends AbstractServerConfigurationBean imp } // Create a ClusterConfigSection and attach it to 'this'. - ClusterConfigSection clusterConf = new ClusterConfigSection(this); - clusterConf.setConfigFile(clusterConfigBean.getConfigFile()); + ClusterConfigSection clusterConf = new ClusterConfigSection(this); }