inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-06-30 18:15:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
99080: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      99031: Merged NESS/5.0.N-2015_03-04 (5.0.2) to 5.0.N (5.0.2)
         99041: MNT-13556 : Integrity check allows null values for mandatory properties
            - replaced "0" string with -1L


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99091 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis 2015-03-10 05:01:12 +00:00
parent dcc1ce2994
commit 361b62755f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/usage/UserUsageTrackingComponent.java
View File

@ -422,7 +422,7 @@ public class UserUsageTrackingComponent extends AbstractLifecycleBean implements
int clearCount = 0; int clearCount = 0;
for (NodeRef personNodeRef : personNodeRefs) for (NodeRef personNodeRef : personNodeRefs)
{ {
nodeService.setProperty(personNodeRef, ContentModel.PROP_SIZE_CURRENT, "0"); nodeService.setProperty(personNodeRef, ContentModel.PROP_SIZE_CURRENT, new Long(-1L));
usageService.deleteDeltas(personNodeRef); usageService.deleteDeltas(personNodeRef);
if (logger.isTraceEnabled()) if (logger.isTraceEnabled())

2
source/test-java/org/alfresco/repo/tenant/MultiTDemoTest.java
View File

@ -963,7 +963,7 @@ public class MultiTDemoTest extends TestCase
// find person // find person
final NodeRef personNodeRef = personService.getPerson(userName); final NodeRef personNodeRef = personService.getPerson(userName);
// clear user usage // clear user usage
nodeService.setProperty(personNodeRef, ContentModel.PROP_SIZE_CURRENT, "0"); nodeService.setProperty(personNodeRef, ContentModel.PROP_SIZE_CURRENT, new Long(-1L));
transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>() transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
{ {
@Override @Override