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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/09/13 02:46:31

  Modified:    src/main/org/jboss/seam/core  ConversationInterceptor.java
  Log:
  JBSEAM-1423
  
  Revision  Changes    Path
  1.3       +18 -1     jboss-seam/src/main/org/jboss/seam/core/ConversationInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConversationInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ConversationInterceptor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ConversationInterceptor.java	25 Jul 2007 19:33:40 -0000	1.2
  +++ ConversationInterceptor.java	13 Sep 2007 06:46:31 -0000	1.3
  @@ -1,4 +1,4 @@
  -//$Id: ConversationInterceptor.java,v 1.2 2007/07/25 19:33:40 gavin Exp $
  +//$Id: ConversationInterceptor.java,v 1.3 2007/09/13 06:46:31 sbryzak2 Exp $
   package org.jboss.seam.core;
   
   import java.lang.reflect.Method;
  @@ -16,6 +16,8 @@
   import org.jboss.seam.bpm.BusinessProcessInterceptor;
   import org.jboss.seam.intercept.AbstractInterceptor;
   import org.jboss.seam.intercept.InvocationContext;
  +import org.jboss.seam.navigation.ConversationIdParameter;
  +import org.jboss.seam.navigation.Pages;
   import org.jboss.seam.pageflow.Pageflow;
   import org.jboss.seam.persistence.PersistenceContexts;
   
  @@ -86,9 +88,12 @@
         if ( !Manager.instance().isLongRunningConversation() )
         {
            String id = null;
  +         String conversation = null;
  +         
            if ( method.isAnnotationPresent(Begin.class) )
            {
               id = method.getAnnotation(Begin.class).id();
  +            conversation = method.getAnnotation(Begin.class).conversation();
            }
            else if ( method.isAnnotationPresent(BeginTask.class) )
            {
  @@ -112,6 +117,18 @@
                  return ce.redirect();
               }
            }
  +         else if (conversation != null && !"".equals(conversation))
  +         {
  +            ConversationIdParameter param = Pages.instance().getConversationIdParameter(conversation);
  +            if (param != null)
  +            {
  +               ConversationEntry ce = ConversationEntries.instance().getConversationEntry(param.getConversationId());
  +               if (ce != null)
  +               {
  +                  return ce.redirect();
  +               }
  +            }            
  +         }
         }
         
         return false;