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

Fix for http://issues.alfresco.com/jira/browse/ALF-713.

Browse Source 
Can't reproduce the bug but spotted a race condition in UserUsageTrackingComponent that may cause this in rare circumstances. Deal with this by throwing a ConcurrencyFailureException and let the txn retry handler retry the operation.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19862 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Steven Glover
2010-04-15 12:38:19 +00:00
parent 47905d3314
commit f14db280f3
7 changed files with 73 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/repo/usage/ContentUsageImpl.java
View File

@@ -504,7 +504,11 @@ public class ContentUsageImpl implements ContentUsageService,
return (currentUsage == null ? -1 : currentUsage);
}
public long getUserUsage(String userName)
public long getUserUsage(String userName) {
return getUserUsage(userName, false);
}
public long getUserUsage(String userName, boolean removeDeltas)
{
ParameterCheck.mandatoryString("userName", userName);
@@ -518,9 +522,11 @@ public class ContentUsageImpl implements ContentUsageService,
if (currentUsage != -1)
{
// add any deltas
currentUsage = currentUsage + usageService.getTotalDeltaSize(personNodeRef);
long deltaSize = removeDeltas ? usageService.getAndRemoveTotalDeltaSize(personNodeRef) :
usageService.getTotalDeltaSize(personNodeRef);
// add any deltas to the currentUsage, removing them if required
currentUsage = currentUsage + deltaSize;
if (currentUsage < 0)
{
if (logger.isWarnEnabled())