diff --git a/source/java/org/alfresco/filesys/server/config/ServerConfiguration.java b/source/java/org/alfresco/filesys/server/config/ServerConfiguration.java index dc0046cdc8..90def79969 100644 --- a/source/java/org/alfresco/filesys/server/config/ServerConfiguration.java +++ b/source/java/org/alfresco/filesys/server/config/ServerConfiguration.java @@ -590,7 +590,23 @@ public class ServerConfiguration { // Get the local domain/workgroup name - setDomainName(getLocalDomainName()); + String localDomain = getLocalDomainName(); + + if ( localDomain == null && getPlatformType() != PlatformType.WINDOWS) + { + // Use a default domain/workgroup name + + localDomain = "WORKGROUP"; + + // Output a warning + + logger.error("Failed to get local domain/workgroup name, using default of " + localDomain); + logger.error("(This may be due to firewall settings or incorrect setting)"); + } + + // Set the local domain/workgroup that the CIFS server belongs to + + setDomainName( localDomain); } // Check for a server comment @@ -2251,12 +2267,9 @@ public class ServerConfiguration if (nbName != null) domainName = nbName.getName(); - else - throw new AlfrescoRuntimeException("Failed to find local domain/workgroup name"); } catch (IOException ex) { - throw new AlfrescoRuntimeException("Failed to determine local domain/workgroup"); } } diff --git a/source/java/org/alfresco/filesys/smb/mailslot/HostAnnouncer.java b/source/java/org/alfresco/filesys/smb/mailslot/HostAnnouncer.java index 73243fa2ed..117cc44a20 100644 --- a/source/java/org/alfresco/filesys/smb/mailslot/HostAnnouncer.java +++ b/source/java/org/alfresco/filesys/smb/mailslot/HostAnnouncer.java @@ -16,6 +16,8 @@ */ package org.alfresco.filesys.smb.mailslot; +import java.io.IOException; + import org.alfresco.filesys.netbios.NetBIOSName; import org.alfresco.filesys.smb.ServerType; import org.alfresco.filesys.smb.TransactionNames; @@ -321,9 +323,19 @@ public abstract class HostAnnouncer extends Thread sleepTime = sleepNormal; } } + catch ( IOException ex) + { + // Debug + + if (m_shutdown == false) + { + logger.error("HostAnnouncer error", ex); + logger.error(" Check setting in file-servers.xml"); + } + m_shutdown = true; + } catch (Exception ex) { - // Debug if (m_shutdown == false)