From f6b0569d6ce7514a7341145020d547d5dfb9e1ad Mon Sep 17 00:00:00 2001 From: Frederik Heremans Date: Wed, 1 Aug 2012 07:53:43 +0000 Subject: [PATCH] Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD: 39969: Merged DEV/BELARUS-V4.1-BUG-FIX-2012_07_09 to V4.0-BUG-FIX: ALF-15273 : Activiti schema updates fail when hibernate.default_schema is set with ORA-00942 The Activiti database is now correctly initialized with the correct "hibernate.default_schema". git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@39970 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/domain/schema/SchemaBootstrap.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java index f7acf0743b..f18bab63ad 100644 --- a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java +++ b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java @@ -784,7 +784,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean String dialectStr = dialect.getClass().getSimpleName(); // Initialise Activiti DB, using an unclosable connection. - initialiseActivitiDBSchema(new UnclosableConnection(connection)); + initialiseActivitiDBSchema(new UnclosableConnection(connection), cfg); if (create) { @@ -877,7 +877,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean * * @param connection Connection to use the initialise DB schema */ - private void initialiseActivitiDBSchema(Connection connection) + private void initialiseActivitiDBSchema(Connection connection, Configuration cfg) { // create instance of activiti engine to initialise schema ProcessEngine engine = null; @@ -893,7 +893,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean buildProcessEngine(); // create or upgrade the DB schema - engine.getManagementService().databaseSchemaUpgrade(connection, null, null); + engine.getManagementService().databaseSchemaUpgrade(connection, null, cfg.getProperty("hibernate.default_schema")); } finally {