Merged 3.1 to HEAD:

14359: Fixed native call being used when <disableNative/> was configured. ETHREEOH-2105.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14596 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gary Spencer
2009-06-09 10:20:11 +00:00
parent 972d555ef4
commit 12f6a70788

View File

@@ -1084,7 +1084,7 @@ public class ServerConfigurationBean extends AbstractServerConfigurationBean {
// Check if WINS is configured, if we are running on Windows and socket based NetBIOS is enabled
else if (cifsConfig.hasNetBIOSSMB() && getPlatformType() == Platform.Type.WINDOWS && isNativeCodeDisabled())
else if (cifsConfig.hasNetBIOSSMB() && getPlatformType() == Platform.Type.WINDOWS && isNativeCodeDisabled() == false)
{
// Get the WINS server list