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

Build/test fix - user usages (no owner)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17044 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2009-10-20 13:18:04 +00:00
parent b137bdb21f
commit f8a8a7a036
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,6 +41,7 @@ import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.OwnableService;
import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.usage.ContentQuotaException; import org.alfresco.service.cmr.usage.ContentQuotaException;
import org.alfresco.service.cmr.usage.ContentUsageService; import org.alfresco.service.cmr.usage.ContentUsageService;
@@ -228,16 +229,16 @@ public class ContentUsageImpl implements ContentUsageService,
// Check for change in owner/creator // Check for change in owner/creator
String ownerBefore = (String)before.get(ContentModel.PROP_OWNER); String ownerBefore = (String)before.get(ContentModel.PROP_OWNER);
if (ownerBefore == null) if ((ownerBefore == null) || (ownerBefore.equals(OwnableService.NO_OWNER)))
{ {
ownerBefore = (String)before.get(ContentModel.PROP_CREATOR); ownerBefore = (String)before.get(ContentModel.PROP_CREATOR);
} }
String ownerAfter = (String)after.get(ContentModel.PROP_OWNER); String ownerAfter = (String)after.get(ContentModel.PROP_OWNER);
if (ownerAfter == null) if ((ownerAfter == null) || (ownerAfter.equals(OwnableService.NO_OWNER)))
{ {
ownerAfter = (String)after.get(ContentModel.PROP_CREATOR); ownerAfter = (String)after.get(ContentModel.PROP_CREATOR);
} }
// check change in size (and possibly owner) // check change in size (and possibly owner)
if (contentSizeBefore == null && contentSizeAfter != null && contentSizeAfter != 0 && ownerAfter != null) if (contentSizeBefore == null && contentSizeAfter != null && contentSizeAfter != 0 && ownerAfter != null)
{ {
@@ -330,7 +331,7 @@ public class ContentUsageImpl implements ContentUsageService,
// Get owner/creator // Get owner/creator
String owner = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_OWNER); String owner = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_OWNER);
if (owner == null) if ((owner == null) || (owner.equals(OwnableService.NO_OWNER)))
{ {
owner = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_CREATOR); owner = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_CREATOR);
} }
@@ -368,6 +369,12 @@ public class ContentUsageImpl implements ContentUsageService,
if ((newOwner != null) && (! newOwner.equals(creator))) if ((newOwner != null) && (! newOwner.equals(creator)))
{ {
if (newOwner.equals(OwnableService.NO_OWNER))
{
// usage has to be applied somewhere, default back to creator for now
newOwner = creator;
}
ContentData content = (ContentData)nodeService.getProperty(nodeRef, ContentModel.PROP_CONTENT); ContentData content = (ContentData)nodeService.getProperty(nodeRef, ContentModel.PROP_CONTENT);
Map<QName, Serializable> before = new HashMap<QName, Serializable>(2); Map<QName, Serializable> before = new HashMap<QName, Serializable>(2);