From 5f5a4ac0527960946e2f68e772654024d670390f Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Mon, 10 Sep 2007 11:57:39 +0000 Subject: [PATCH] Merged V2.1 to HEAD 6499: Duplicate FK removal script fix 6593: Full export/import aspect missing fix 6673: AR-1731JavaScript processTemplate() git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6714 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../AlfrescoSchemaUpdate-2.1-FKIndexes.sql | 2 +- .../java/org/alfresco/repo/importer/view/NodeContext.java | 4 ++-- .../org/alfresco/repo/processor/TemplateServiceImpl.java | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-2.1-FKIndexes.sql b/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-2.1-FKIndexes.sql index f8f12fc7b0..2b293de85f 100644 --- a/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-2.1-FKIndexes.sql +++ b/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-2.1-FKIndexes.sql @@ -9,7 +9,7 @@ -- The MySQL InnoDB Dialect has special support for foreign keys. -- Remove pointless duplicated FK indexes -ALTER TABLE alf_global_attributes DROP INDEX FK64D0B9CF69B9F16A; +ALTER TABLE alf_global_attributes DROP INDEX FK64D0B9CF69B9F16A;(optional) -- -- Record script finish diff --git a/source/java/org/alfresco/repo/importer/view/NodeContext.java b/source/java/org/alfresco/repo/importer/view/NodeContext.java index b718a3811e..600fa9d3de 100644 --- a/source/java/org/alfresco/repo/importer/view/NodeContext.java +++ b/source/java/org/alfresco/repo/importer/view/NodeContext.java @@ -421,8 +421,8 @@ public class NodeContext extends ElementContext */ public AspectDefinition determineAspect(QName defName) { - AspectDefinition def = null; - if (nodeAspects.containsKey(defName) == false) + AspectDefinition def = nodeAspects.get(defName); + if (def == null) { def = getDictionaryService().getAspect(defName); } diff --git a/source/java/org/alfresco/repo/processor/TemplateServiceImpl.java b/source/java/org/alfresco/repo/processor/TemplateServiceImpl.java index 7b59724ba7..a5b8fc5fcf 100644 --- a/source/java/org/alfresco/repo/processor/TemplateServiceImpl.java +++ b/source/java/org/alfresco/repo/processor/TemplateServiceImpl.java @@ -78,7 +78,11 @@ public class TemplateServiceImpl implements TemplateService * @see org.alfresco.service.cmr.repository.TemplateService#getTemplateProcessor(java.lang.String) */ public TemplateProcessor getTemplateProcessor(String engine) - { + { + if (engine == null) + { + engine = this.defaultTemplateEngine; + } return this.processors.get(engine); }