From ee7b890b2c6edd9640980514602070087cbd12c5 Mon Sep 17 00:00:00 2001
From: David Caruana <david.caruana@alfresco.com>
Date: Thu, 24 May 2007 12:34:36 +0000
Subject: [PATCH] Fix premature db access in initialisation of workflow
 interpreter.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5773 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repo/workflow/WorkflowInterpreter.java    | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java b/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java
index affd20b4b8..3fdb5f3656 100644
--- a/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java
+++ b/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java
@@ -68,10 +68,11 @@ import org.alfresco.service.cmr.workflow.WorkflowTransition;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.AbstractLifecycleBean;
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.GUID;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationEvent;
 import org.springframework.core.io.ClassPathResource;
 
 /**
@@ -79,7 +80,7 @@ import org.springframework.core.io.ClassPathResource;
  * 
  * @author davidc
  */
-public class WorkflowInterpreter implements InitializingBean
+public class WorkflowInterpreter extends AbstractLifecycleBean
 {
     // Service dependencies    
     private WorkflowService workflowService;
@@ -138,14 +139,31 @@ public class WorkflowInterpreter implements InitializingBean
     }
 
     /* (non-Javadoc)
-     * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
+     * @see org.alfresco.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.ApplicationEvent)
      */
-    public void afterPropertiesSet() throws Exception
+    @Override
+    protected void onBootstrap(ApplicationEvent event)
     {
-        interpretCommand("var bpm:package package 1");
-        interpretCommand("var bpm:assignee person admin");
+        try
+        {
+            interpretCommand("var bpm:package package 1");
+            interpretCommand("var bpm:assignee person admin");
+        }
+        catch(IOException e)
+        {
+            throw new WorkflowException("Failed to initialise WorkflowInterpreter", e);
+        }
     }
 
+    /* (non-Javadoc)
+     * @see org.alfresco.util.AbstractLifecycleBean#onShutdown(org.springframework.context.ApplicationEvent)
+     */
+    @Override
+    protected void onShutdown(ApplicationEvent event)
+    {
+        // NOOP
+    }
+    
     /**
      * @param workflowService The Workflow Service
      */