From e41bdeffeace7bce58f441207dc56cdcf3950739 Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Thu, 23 Apr 2009 13:26:24 +0000 Subject: [PATCH] Fix handling of org.alfresco.filesys.config.CIFSConfigBean.getBindToAddress(). An empty string value should be treated equivalent to null. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14068 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../subsystems/fileServers/default/file-servers.properties | 2 +- .../org/alfresco/filesys/config/ServerConfigurationBean.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/alfresco/subsystems/fileServers/default/file-servers.properties b/config/alfresco/subsystems/fileServers/default/file-servers.properties index 240aaa0447..fbbfa3ffc0 100644 --- a/config/alfresco/subsystems/fileServers/default/file-servers.properties +++ b/config/alfresco/subsystems/fileServers/default/file-servers.properties @@ -5,7 +5,7 @@ cifs.serverName=${localname}A cifs.domain= cifs.broadcast=255.255.255.255 # An empty value indicates bind to all available network adapters -cifs.bindto=0.0.0.0 +cifs.bindto= cifs.ipv6.enabled=false cifs.hostannounce=true # Enable the use of asynchronous sockets/NIO code diff --git a/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java b/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java index 3aa2dfe713..c37da5f286 100644 --- a/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java +++ b/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java @@ -331,7 +331,8 @@ public class ServerConfigurationBean extends AbstractServerConfigurationBean cifsConfig.setSMBBindAddress(bindAddr); } - else if ((bindTo = cifsConfigBean.getBindToAddress()) != null && !bindTo.equals(BIND_TO_IGNORE)) + else if ((bindTo = cifsConfigBean.getBindToAddress()) != null && bindTo.length() > 0 + && !bindTo.equals(BIND_TO_IGNORE)) { // Validate the bind address