inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
89958: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      89872: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         89708: MNT-12290: Merged PATCHES/V3.4.14 to V4.1-BUG-FIX
          88898 : MNT-12291 : CLONE - disconnectClientSessions assumptions don't work on Terminal Servers
           Added a couple of new configuration values for the CIFS server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94649 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 10:45:07 +00:00
parent 786e58f936
commit 961623f6e6
4 changed files with 95 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source/java/org/alfresco/filesys/config/ServerConfigurationBean.java
View File

@@ -234,6 +234,38 @@ public class ServerConfigurationBean extends AbstractServerConfigurationBean imp
cifsConfig.setBroadcastMask(broadcastAddess);
}
// Get the terminal server address
List<String> terminalServerList = cifsConfigBean.getTerminalServerList();
if (terminalServerList != null && terminalServerList.size() > 0)
{
// Check if the terminal server address is a valid numeric IP address
for (String terminalServerAddress : terminalServerList)
{
if (IPAddress.isNumericAddress(terminalServerAddress) == false)
throw new AlfrescoRuntimeException("Invalid terminal server address, must be n.n.n.n format");
}
// Set the terminal server address
cifsConfig.setTerminalServerList(terminalServerList);
}
// Get the load balancer address
List<String> loadBalancerList = cifsConfigBean.getLoadBalancerList();
if (loadBalancerList != null && loadBalancerList.size() > 0)
{
// Check if the load balancer address is a valid numeric IP address
for (String loadBalancerAddress : loadBalancerList)
{
if (IPAddress.isNumericAddress(loadBalancerAddress) == false)
throw new AlfrescoRuntimeException("Invalid load balancer address, must be n.n.n.n format");
}
// Set the terminal server address
cifsConfig.setLoadBalancerList(loadBalancerList);
}
// Get the host configuration
String hostName = cifsConfigBean.getServerName();