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.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
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
This commit is contained in:
Alan Davis
2015-03-07 08:08:37 +00:00
parent 2443a9b771
commit 12c3514477
2 changed files with 2 additions and 2 deletions
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, null); nodeService.setProperty(personNodeRef, ContentModel.PROP_SIZE_CURRENT, "0");
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, ""); nodeService.setProperty(personNodeRef, ContentModel.PROP_SIZE_CURRENT, "0");
transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>() transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
{ {
@Override @Override