Merged V2.2 to HEAD

11016: Query performance improvements
   11018: Build fixes after .... Query performance improvements
   11043: Updated Lucene config and test fixes
   11047: Fixed test's expected results
   11049: Build fix
   11051: Tighten up on Auditable tests and checks for null


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11221 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-10-06 23:06:54 +00:00
parent 17e9f1d7ac
commit ad23a594f5
11 changed files with 777 additions and 1076 deletions

View File

@@ -92,11 +92,12 @@ public class AuditableProperties
}
else if (qname.equals(ContentModel.PROP_MODIFIER))
{
return auditModifier;
return auditModifier == null ? auditCreator : auditModifier;
}
else if (qname.equals(ContentModel.PROP_MODIFIED))
{
return DefaultTypeConverter.INSTANCE.convert(Date.class, auditModified);
String dateStr = auditModified == null ? auditCreated : auditModified;
return DefaultTypeConverter.INSTANCE.convert(Date.class, dateStr);
}
else if (qname.equals(ContentModel.PROP_ACCESSED))
{