inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
82394: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80104: Bug fixed user Create / Update event generation, mistakenly creating multiple events.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83237 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-04 06:58:44 +00:00
parent fd970bf2f8
commit 825e6c29a6
1 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
source/java/org/alfresco/repo/security/person/PersonServiceImpl.java
View File

@@ -997,6 +997,8 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
removeFromCache(userName, false); removeFromCache(userName, false);
publishEvent("user.create", this.nodeService.getProperties(personRef));
return personRef; return personRef;
} }
@@ -1759,7 +1761,6 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
makeHomeFolderAsSystem(childAssocRef); makeHomeFolderAsSystem(childAssocRef);
} }
reportEvent("user.create", this.nodeService.getProperties(personRef));
} }
private QName getChildNameLower(String userName) private QName getChildNameLower(String userName)
@@ -1991,11 +1992,42 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
} }
} }
reportEvent("user.update", after);
if(validUserUpdateEvent(before, after))
{
publishEvent("user.update", after);
} }
}
private void reportEvent(String eventType, Map<QName, Serializable> properties) /**
* Determine if the updated properties constitute a valid user update.
* Currently we only check for updates to the user firstname, lastname
*
* @param before
* @param after
* @return
*/
private boolean validUserUpdateEvent(Map<QName, Serializable> before, Map<QName, Serializable> after)
{
final String firstnameBefore = (String)before.get(ContentModel.PROP_FIRSTNAME);
final String lastnameBefore = (String)before.get(ContentModel.PROP_LASTNAME);
final String firstnameAfter = (String)after.get(ContentModel.PROP_FIRSTNAME);
final String lastnameAfter = (String)after.get(ContentModel.PROP_LASTNAME);
boolean updatedFirstName = !EqualsHelper.nullSafeEquals(firstnameBefore, firstnameAfter);
boolean updatedLastName = !EqualsHelper.nullSafeEquals(lastnameBefore, lastnameAfter);
return updatedFirstName || updatedLastName;
}
/**
* Publish new user event
*
* @param eventType
* @param properties
*/
private void publishEvent(String eventType, Map<QName, Serializable> properties)
{ {
if(properties == null) return; if(properties == null) return;