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

Merged V3.2 to HEAD

Browse Source 
15837: ETHREEOH-2701: Do not allow partial initialization of file server configuration bean
      - Even when all of the file servers are disabled, this bean must be queryable by the rest of the system
      - Therefore if it fails to initialize, the server should fail to start
      - Fatal exceptions now propagated by AbstractServerConfigurationBean.init()


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15839 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2009-08-20 14:58:10 +00:00
parent 33cb2a4d75
commit a96352a781
1 changed files with 64 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/java/org/alfresco/filesys/AbstractServerConfigurationBean.java
View File

@@ -432,8 +432,6 @@ public abstract class AbstractServerConfigurationBean extends ServerConfiguratio
// Initialize the filesystems // Initialize the filesystems
boolean filesysInitOK = false;
try try
{ {
// Process the core server configuration // Process the core server configuration
@@ -444,21 +442,15 @@ public abstract class AbstractServerConfigurationBean extends ServerConfiguratio
// Process the filesystems configuration // Process the filesystems configuration
processFilesystemsConfig(); processFilesystemsConfig();
// Indicate that the filesystems were initialized
filesysInitOK = true;
} }
catch (Exception ex) catch (Exception ex)
{ {
// Configuration error // Configuration error
throw new AlfrescoRuntimeException("File server configuration error, " + ex.getMessage(), ex);
logger.error("File server configuration error, " + ex.getMessage(), ex);
} }
// Initialize the CIFS and FTP servers, if the filesystem(s) initialized successfully // Initialize the CIFS and FTP servers, if the filesystem(s) initialized successfully
if ( filesysInitOK == true)
{
// Initialize the CIFS server // Initialize the CIFS server
try try
@@ -527,13 +519,6 @@ public abstract class AbstractServerConfigurationBean extends ServerConfiguratio
logger.error("NFS server configuration error, " + ex.getMessage(), ex); logger.error("NFS server configuration error, " + ex.getMessage(), ex);
} }
} }
else
{
// Log the error
logger.error("CIFS and FTP servers not started due to filesystem initialization error");
}
}
protected abstract void processCoreServerConfig() throws InvalidConfigurationException; protected abstract void processCoreServerConfig() throws InvalidConfigurationException;