[seam-commits] Seam SVN: r9491 - trunk/src/main/org/jboss/seam/contexts.

[seam-commits at lists.jboss.org]

Author: youngm
Date: 2008-11-03 19:41:07 -0500 (Mon, 03 Nov 2008)
New Revision: 9491

Modified:
   trunk/src/main/org/jboss/seam/contexts/BusinessProcessContext.java
   trunk/src/main/org/jboss/seam/contexts/Lifecycle.java
   trunk/src/main/org/jboss/seam/contexts/TestLifecycle.java
Log:
JBSEAM-3654

Modified: trunk/src/main/org/jboss/seam/contexts/BusinessProcessContext.java
===================================================================
--- trunk/src/main/org/jboss/seam/contexts/BusinessProcessContext.java	2008-11-04 00:36:05 UTC (rev 9490)
+++ trunk/src/main/org/jboss/seam/contexts/BusinessProcessContext.java	2008-11-04 00:41:07 UTC (rev 9491)
@@ -35,13 +35,25 @@
 
    private final Map<String, Object> additions = new HashMap<String, Object>();
    private final Set<String> removals = new HashSet<String>();
+   private final boolean enabled;
 
    public ScopeType getType()
    {
       return ScopeType.BUSINESS_PROCESS;
    }
 
-   public BusinessProcessContext() {}
+   public BusinessProcessContext()
+   {
+      Init init = Init.instance();
+      if (init == null)
+      {
+         enabled = false;
+      }
+      else
+      {
+         enabled = init.isJbpmInstalled();
+      }
+   }
    
    public Object get(String name) 
    {
@@ -208,8 +220,7 @@
 
    private org.jbpm.graph.exe.ProcessInstance getProcessInstance()
    {
-      Init init = Init.instance(); //may be null in some tests
-      if ( init==null || !init.isJbpmInstalled() ) 
+      if (!enabled)
       {
          return null;
       }
@@ -221,8 +232,7 @@
    
    private org.jbpm.taskmgmt.exe.TaskInstance getTaskInstance()
    {
-      Init init = Init.instance(); //may be null in some tests
-      if ( init==null || !init.isJbpmInstalled() ) 
+      if (!enabled)
       {
          return null;
       }

Modified: trunk/src/main/org/jboss/seam/contexts/Lifecycle.java
===================================================================
--- trunk/src/main/org/jboss/seam/contexts/Lifecycle.java	2008-11-04 00:36:05 UTC (rev 9490)
+++ trunk/src/main/org/jboss/seam/contexts/Lifecycle.java	2008-11-04 00:41:07 UTC (rev 9491)
@@ -81,11 +81,11 @@
    public static void beginCall()
    {
       log.debug( ">>> Begin call" );
+      Contexts.applicationContext.set( new ApplicationContext(getApplication()) );
       Contexts.eventContext.set( new BasicContext(ScopeType.EVENT) );
       Contexts.sessionContext.set( new BasicContext(ScopeType.SESSION) );
       Contexts.conversationContext.set( new BasicContext(ScopeType.CONVERSATION) );
       Contexts.businessProcessContext.set( new BusinessProcessContext() );
-      Contexts.applicationContext.set( new ApplicationContext(getApplication()) );
    }
 
    public static void endCall()

Modified: trunk/src/main/org/jboss/seam/contexts/TestLifecycle.java
===================================================================
--- trunk/src/main/org/jboss/seam/contexts/TestLifecycle.java	2008-11-04 00:36:05 UTC (rev 9490)
+++ trunk/src/main/org/jboss/seam/contexts/TestLifecycle.java	2008-11-04 00:41:07 UTC (rev 9491)
@@ -29,11 +29,11 @@
    public static void beginTest(ServletContext context, Map<String, Object> session)
    {
       log.debug( ">>> Begin test" );
+      Contexts.applicationContext.set( new ApplicationContext( new ServletApplicationMap(context) ) );
       Contexts.eventContext.set( new BasicContext(ScopeType.EVENT) );
       Contexts.conversationContext.set( new BasicContext(ScopeType.CONVERSATION) );
       Contexts.businessProcessContext.set( new BusinessProcessContext() );
       Contexts.sessionContext.set( new SessionContext(session) );
-      Contexts.applicationContext.set( new ApplicationContext( new ServletApplicationMap(context) ) );
    }
 
    public static void endTest()