Fix merge fail.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24939 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java

@@ -444,6 +444,9 @@ public class CheckOutCheckInServiceImpl implements CheckOutCheckInService
             }
         }, AuthenticationUtil.getSystemUserName());
         
+        // Get the user 
+        String userName = getUserName();
+        
         ruleService.disableRules();
         try
         {
@@ -459,9 +462,6 @@ public class CheckOutCheckInServiceImpl implements CheckOutCheckInService
         {
             ruleService.enableRules();
         }
-
-        // Get the user 
-        String userName = getUserName();
         
         // Lock the original node
         this.lockService.lock(nodeRef, LockType.READ_ONLY_LOCK);