diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/RecordsManagementJob.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/RecordsManagementJob.java
index ac31ef8117..c168b48aa0 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/RecordsManagementJob.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/RecordsManagementJob.java
@@ -30,31 +30,31 @@ import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 
 /**
- * Base records management job implementation.  
+ * Base records management job implementation.
  * <p>
  * Delegates job execution and ensures locking
  * is enforced.
- * 
+ *
  * @author Roy Wetherall
  */
 public class RecordsManagementJob implements Job
 {
-    private static long DEFAULT_TIME = 30000L;
-    
+    private static final long DEFAULT_TIME = 30000L;
+
     private JobLockService jobLockService;
-    
+
     private RecordsManagementJobExecuter jobExecuter;
-    
+
     private String jobName;
-    
+
     private QName getLockQName()
     {
         return QName.createQName(NamespaceService.SYSTEM_MODEL_1_0_URI, jobName);
     }
-    
+
     /**
      * Attempts to get the lock.  If the lock couldn't be taken, then <tt>null</tt> is returned.
-     * 
+     *
      * @return          Returns the lock token or <tt>null</tt>
      */
     private String getLock()
@@ -68,7 +68,7 @@ public class RecordsManagementJob implements Job
             return null;
         }
     }
-    
+
     @Override
     public void execute(JobExecutionContext context) throws JobExecutionException
     {
@@ -78,29 +78,29 @@ public class RecordsManagementJob implements Job
         {
             throw new AlfrescoRuntimeException("Job lock service has not been specified.");
         }
-        
+
         // get the job executer
         jobExecuter = (RecordsManagementJobExecuter)context.getJobDetail().getJobDataMap().get("jobExecuter");
         if (jobExecuter == null)
         {
             throw new AlfrescoRuntimeException("Job executer has not been specified.");
         }
-        
+
         // get the job name
         jobName = (String)context.getJobDetail().getJobDataMap().get("jobName");
         if (jobName == null)
         {
             throw new AlfrescoRuntimeException("Job name has not been specified.");
         }
-        
+
         AuthenticationUtil.runAs(new RunAsWork<Void>()
         {
             public Void doWork() throws Exception
-            {        
+            {
                 // try and get the lock
                 String lockToken = getLock();
                 if (lockToken != null)
-                {                               
+                {
                     try
                     {
                         // do work
@@ -111,8 +111,8 @@ public class RecordsManagementJob implements Job
                         jobLockService.releaseLock(lockToken, getLockQName());
                     }
                 }
-            
-                // return 
+
+                // return
                 return null;
             }
         }, AuthenticationUtil.getSystemUserName());
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/RMv2ModelPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/RMv2ModelPatch.java
index c68e896c42..5859a1fb47 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/RMv2ModelPatch.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/RMv2ModelPatch.java
@@ -41,7 +41,7 @@ import org.springframework.beans.factory.BeanNameAware;
 public class RMv2ModelPatch extends ModulePatchComponent
                             implements BeanNameAware, RecordsManagementModel, DOD5015Model
 {
-    private static long BATCH_SIZE = 100000L;
+    private static final long BATCH_SIZE = 100000L;
 
     private PatchDAO patchDAO;
     private NodeDAO nodeDAO;
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22DODModelSeparationModulePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22DODModelSeparationModulePatch.java
index 8f09127177..2030de69bc 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22DODModelSeparationModulePatch.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22DODModelSeparationModulePatch.java
@@ -40,7 +40,7 @@ public class RMv22DODModelSeparationModulePatch extends AbstractModulePatch
                                            implements RecordsManagementModel
 {
     /** query batch size */
-    private static long BATCH_SIZE = 100000L;
+    private static final long BATCH_SIZE = 100000L;
 
     /** QName DAO */
     private QNameDAO qnameDAO;