Updated label and a couple of code tidy-ups.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@70111 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2014-05-13 02:14:25 +00:00
parent b50335bb83
commit 248e997d89
4 changed files with 20 additions and 19 deletions

View File

@@ -714,7 +714,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
// Done
return auditTrailFile;
}
catch (Throwable e)
catch (IOException e)
{
throw new AlfrescoRuntimeException(MSG_TRAIL_FILE_FAIL, e);
}
@@ -743,7 +743,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
// Done
return entries;
}
catch (Throwable e)
catch (IOException e)
{
// Should be
throw new AlfrescoRuntimeException(MSG_TRAIL_FILE_FAIL, e);

View File

@@ -32,17 +32,26 @@ import org.alfresco.service.cmr.repository.StoreRef;
*/
public class BootstrapImporterModuleComponent extends ImporterModuleComponent
{
/** rm config folder name */
private static final String CONFIG_NODEID = "rm_config_folder";
/** node service */
private NodeService nodeService;
/** module patch executer */
private ModulePatchExecuter modulePatchExecuter;
/**
* @param nodeService node service
*/
public void setNodeService(NodeService nodeService)
{
this.nodeService = nodeService;
}
/**
* @param modulePatchExecuter module patch executer
*/
public void setModulePatchExecuter(ModulePatchExecuter modulePatchExecuter)
{
this.modulePatchExecuter = modulePatchExecuter;
@@ -55,22 +64,14 @@ public class BootstrapImporterModuleComponent extends ImporterModuleComponent
*/
@Override
protected void executeInternal() throws Throwable
{
try
{
NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, CONFIG_NODEID);
if (!nodeService.exists(nodeRef))
{
NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, CONFIG_NODEID);
if (!nodeService.exists(nodeRef))
{
super.executeInternal();
super.executeInternal();
// init module schema number
modulePatchExecuter.initSchemaVersion();
}
}
catch (Throwable exception)
{
exception.printStackTrace();
throw exception;
}
// init module schema number
modulePatchExecuter.initSchemaVersion();
}
}
}

View File

@@ -399,7 +399,7 @@ public class CustomEmailMappingServiceImpl extends AbstractLifecycleBean impleme
// update the extractor with the custom mappings
updateExtractor();
}
catch (Throwable e)
catch (RuntimeException e)
{
// log a warning
if (logger.isWarnEnabled())

View File

@@ -368,7 +368,7 @@ public class FilePlanServiceImpl extends ServiceBaseImpl
{
getNodeRefPathRecursive(nodeRef, nodeRefPath);
}
catch (Throwable e)
catch (RuntimeException e)
{
throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_PATH_NODE, nodeRef), e);
}