[jboss-cvs] jboss-seam/src/main/org/jboss/seam/core ...

[Gavin King]

  User: gavin   
  Date: 06/10/03 19:15:58

  Modified:    src/main/org/jboss/seam/core    BusinessProcess.java
                        ProcessInstance.java TaskInstance.java
  Log:
  JBSEAM-78, destroy method call for business process context
  
  Revision  Changes    Path
  1.4       +13 -5     jboss-seam/src/main/org/jboss/seam/core/BusinessProcess.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BusinessProcess.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/BusinessProcess.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- BusinessProcess.java	3 Oct 2006 22:21:39 -0000	1.3
  +++ BusinessProcess.java	3 Oct 2006 23:15:58 -0000	1.4
  @@ -40,6 +40,16 @@
         return (BusinessProcess) Component.getInstance(BusinessProcess.class, ScopeType.CONVERSATION, true);
      }
   
  +   public boolean hasCurrentProcess()
  +   {
  +      return processId!=null;
  +   }
  +
  +   public boolean hasCurrentTask()
  +   {
  +      return taskId!=null;
  +   }
  +
      public Long getProcessId() {
         return processId;
      }
  @@ -114,7 +124,7 @@
            task.end(transitionName);
         }
         
  -      setTaskId(null);
  +      setTaskId(null); //TODO: do I really need this???!
         
         Events.instance().raiseEvent("org.jboss.seam.endTask." + task.getTask().getName());
   
  @@ -181,14 +191,12 @@
   
      public boolean checkTask()
      {
  -      TaskInstance task = org.jboss.seam.core.TaskInstance.instance();
  -      Long taskId = getTaskId();
  -      if ( task==null )
  +      if ( !hasCurrentTask() )
         {
            taskNotFound(taskId);
            return false;
         }
  -      else if ( task.hasEnded() )
  +      else if ( org.jboss.seam.core.TaskInstance.instance().hasEnded() )
         {
            taskEnded(taskId);
            return false;
  
  
  
  1.11      +2 -2      jboss-seam/src/main/org/jboss/seam/core/ProcessInstance.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ProcessInstance.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ProcessInstance.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- ProcessInstance.java	28 Jun 2006 17:32:13 -0000	1.10
  +++ ProcessInstance.java	3 Oct 2006 23:15:58 -0000	1.11
  @@ -20,7 +20,7 @@
    * jBPM ProcessInstance.
    * 
    * @author Gavin King
  - * @version $Revision: 1.10 $
  + * @version $Revision: 1.11 $
    */
   @Scope(ScopeType.APPLICATION)
   @Name("processInstance")
  @@ -49,7 +49,7 @@
      
      public static org.jbpm.graph.exe.ProcessInstance instance()
      {
  -      if ( !Contexts.isConversationContextActive() || BusinessProcess.instance().getProcessId()==null ) return null; //so we don't start a txn
  +      if ( !Contexts.isConversationContextActive() || !BusinessProcess.instance().hasCurrentProcess() ) return null; //so we don't start a txn
         
         if ( !Contexts.isApplicationContextActive() )
         {
  
  
  
  1.10      +2 -2      jboss-seam/src/main/org/jboss/seam/core/TaskInstance.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TaskInstance.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/TaskInstance.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- TaskInstance.java	28 Jun 2006 17:32:13 -0000	1.9
  +++ TaskInstance.java	3 Oct 2006 23:15:58 -0000	1.10
  @@ -20,7 +20,7 @@
    * jBPM TaskInstance.
    * 
    * @author Gavin King
  - * @version $Revision: 1.9 $
  + * @version $Revision: 1.10 $
    */
   @Scope(ScopeType.APPLICATION)
   @Name("taskInstance")
  @@ -49,7 +49,7 @@
      
      public static org.jbpm.taskmgmt.exe.TaskInstance instance()
      {
  -      if ( BusinessProcess.instance().getTaskId()==null ) return null; //so we don't start a txn
  +      if ( !Contexts.isConversationContextActive() || !BusinessProcess.instance().hasCurrentTask() ) return null; //so we don't start a txn
         
         if ( !Contexts.isApplicationContextActive() )
         {