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

[Gavin King]

  User: gavin   
  Date: 06/12/19 11:57:04

  Modified:    src/main/org/jboss/seam/interceptors 
                        ConversationInterceptor.java
  Log:
  fix bug with @Begin(id=...)
  
  Revision  Changes    Path
  1.56      +25 -22    jboss-seam/src/main/org/jboss/seam/interceptors/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/interceptors/ConversationInterceptor.java,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -b -r1.55 -r1.56
  --- ConversationInterceptor.java	17 Nov 2006 07:12:56 -0000	1.55
  +++ ConversationInterceptor.java	19 Dec 2006 16:57:04 -0000	1.56
  @@ -1,4 +1,4 @@
  -//$Id: ConversationInterceptor.java,v 1.55 2006/11/17 07:12:56 gavin Exp $
  +//$Id: ConversationInterceptor.java,v 1.56 2006/12/19 16:57:04 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import java.lang.reflect.Method;
  @@ -57,6 +57,8 @@
      
      public boolean redirectToExistingConversation(Method method)
      {
  +      if ( !Manager.instance().isLongRunningConversation() )
  +      {
         String id = null;
         if ( method.isAnnotationPresent(Begin.class) )
         {
  @@ -84,6 +86,7 @@
               return ce.switchConversation();
            }
         }
  +      }
         
         return false;
      }