From 361b62755fbf09cd55e8c71b6c159c3780cfdbff Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 10 Mar 2015 05:01:12 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 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 --- .../org/alfresco/repo/usage/UserUsageTrackingComponent.java | 2 +- source/test-java/org/alfresco/repo/tenant/MultiTDemoTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/usage/UserUsageTrackingComponent.java b/source/java/org/alfresco/repo/usage/UserUsageTrackingComponent.java index e7a8c5d14f..afdf068120 100644 --- a/source/java/org/alfresco/repo/usage/UserUsageTrackingComponent.java +++ b/source/java/org/alfresco/repo/usage/UserUsageTrackingComponent.java @@ -422,7 +422,7 @@ public class UserUsageTrackingComponent extends AbstractLifecycleBean implements int clearCount = 0; 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); if (logger.isTraceEnabled()) diff --git a/source/test-java/org/alfresco/repo/tenant/MultiTDemoTest.java b/source/test-java/org/alfresco/repo/tenant/MultiTDemoTest.java index 82aa1a3a22..fbbdf4d463 100644 --- a/source/test-java/org/alfresco/repo/tenant/MultiTDemoTest.java +++ b/source/test-java/org/alfresco/repo/tenant/MultiTDemoTest.java @@ -963,7 +963,7 @@ public class MultiTDemoTest extends TestCase // find person final NodeRef personNodeRef = personService.getPerson(userName); // 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() { @Override