From 12c3514477daef5fd813472739af41e3082532a7 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 7 Mar 2015 08:08:37 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 98971: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) 98947: Merged DEV to 5.0.N (5.0.2) 98946: MNT-13556 : Integrity check allows null values for mandatory properties - fixed failing tests and new issue caused by initial changes git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98987 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 d3a82cc5ee..e7a8c5d14f 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, null); + nodeService.setProperty(personNodeRef, ContentModel.PROP_SIZE_CURRENT, "0"); 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 beecb33ed8..82aa1a3a22 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, ""); + nodeService.setProperty(personNodeRef, ContentModel.PROP_SIZE_CURRENT, "0"); transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback() { @Override