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

[Gavin King]

  User: gavin   
  Date: 06/12/16 11:05:20

  Modified:    src/main/org/jboss/seam/contexts  Lifecycle.java
  Log:
  reduce jbpm dependency
  
  Revision  Changes    Path
  1.73      +6 -8      jboss-seam/src/main/org/jboss/seam/contexts/Lifecycle.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Lifecycle.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/Lifecycle.java,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -b -r1.72 -r1.73
  --- Lifecycle.java	16 Dec 2006 02:58:10 -0000	1.72
  +++ Lifecycle.java	16 Dec 2006 16:05:20 -0000	1.73
  @@ -15,8 +15,6 @@
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpSession;
   
  -import org.jboss.seam.log.LogProvider;
  -import org.jboss.seam.log.Logging;
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.Seam;
  @@ -26,12 +24,13 @@
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Manager;
   import org.jboss.seam.core.Mutable;
  -import org.jboss.seam.core.ProcessInstance;
  +import org.jboss.seam.log.LogProvider;
  +import org.jboss.seam.log.Logging;
   
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.72 $
  + * @version $Revision: 1.73 $
    */
   public class Lifecycle
   {
  @@ -332,11 +331,10 @@
   
            if ( Contexts.isBusinessProcessContextActive() )
            {
  -            boolean destroyBusinessProcessContext = !Init.instance().isJbpmInstalled() ||
  -                  !BusinessProcess.instance().hasCurrentProcess() ||
                     //TODO: it would be nice if BP context spanned redirects along with the conversation
                     //      this would also require changes to BusinessProcessContext
  -                  ProcessInstance.instance().hasEnded();
  +            boolean destroyBusinessProcessContext = !Init.instance().isJbpmInstalled() ||
  +                  !BusinessProcess.instance().hasActiveProcess();
               if ( destroyBusinessProcessContext )
               {
                  //TODO: note that this occurs from Lifecycle.endRequest(), after