From 248e997d893a426604cc3ba9c56a830a7533433d Mon Sep 17 00:00:00 2001
From: Roy Wetherall <roy.wetherall@alfresco.com>
Date: Tue, 13 May 2014 02:14:25 +0000
Subject: [PATCH] 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
---
 .../RecordsManagementAuditServiceImpl.java    |  4 +--
 .../BootstrapImporterModuleComponent.java     | 31 ++++++++++---------
 .../email/CustomEmailMappingServiceImpl.java  |  2 +-
 .../fileplan/FilePlanServiceImpl.java         |  2 +-
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
index 3311d639a3..d614916ceb 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
@@ -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);
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/BootstrapImporterModuleComponent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/BootstrapImporterModuleComponent.java
index 3ce951406c..65cf3035df 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/BootstrapImporterModuleComponent.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/BootstrapImporterModuleComponent.java
@@ -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();
+        }        
     }
 }
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java
index d81f191bb4..e2670285a6 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java
@@ -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())
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java
index 15a7a9727b..e78289ee48 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java
@@ -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);
         }