From 47ea63963e24a542e68ef247461640b8f9795819 Mon Sep 17 00:00:00 2001
From: Roy Wetherall <roy.wetherall@alfresco.com>
Date: Wed, 16 Oct 2013 04:31:32 +0000
Subject: [PATCH] RM-1071: Impossible to create folder after upgrade: Access
 Denied

 * handle cases where rmadmin person object already exists



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@56717 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../patch/RMv2RMAdminUserPatch.java           | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2RMAdminUserPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2RMAdminUserPatch.java
index 46492ad86a..bd63231482 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2RMAdminUserPatch.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2RMAdminUserPatch.java
@@ -127,12 +127,28 @@ public class RMv2RMAdminUserPatch extends ModulePatchComponent implements BeanNa
             }
             
             authenticationService.createAuthentication(user, password.toCharArray());
-            Map<QName, Serializable> properties = new HashMap<QName, Serializable>();
-            properties.put(ContentModel.PROP_USERNAME, user);
-            properties.put(ContentModel.PROP_FIRSTNAME, firstName);
-            properties.put(ContentModel.PROP_LASTNAME, lastName);
-            personService.createPerson(properties);
             
+            if (personService.personExists(user) == false)
+            {
+                if (logger.isDebugEnabled() == true)
+                {
+                    logger.debug("   ... creating RM Admin person");
+                }
+                
+                Map<QName, Serializable> properties = new HashMap<QName, Serializable>();
+                properties.put(ContentModel.PROP_USERNAME, user);
+                properties.put(ContentModel.PROP_FIRSTNAME, firstName);
+                properties.put(ContentModel.PROP_LASTNAME, lastName);
+                personService.createPerson(properties);
+            }
+            else
+            {
+                if (logger.isInfoEnabled() == true)
+                {
+                    logger.debug("   ... RM Admin person already exists");
+                }
+            }
+                
             if (logger.isDebugEnabled() == true)
             {
                 logger.debug("   ... assigning RM Admin user to file plans");