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

[Gavin King]

  User: gavin   
  Date: 06/11/17 02:12:56

  Modified:    src/main/org/jboss/seam/interceptors  
                        ConversationInterceptor.java
                        ConversationalInterceptor.java
  Log:
  fix a bug with begin during an ended nested conversation
  
  Revision  Changes    Path
  1.55      +3 -3      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.54
  retrieving revision 1.55
  diff -u -b -r1.54 -r1.55
  --- ConversationInterceptor.java	16 Nov 2006 22:58:13 -0000	1.54
  +++ ConversationInterceptor.java	17 Nov 2006 07:12:56 -0000	1.55
  @@ -1,4 +1,4 @@
  -//$Id: ConversationInterceptor.java,v 1.54 2006/11/16 22:58:13 gavin Exp $
  +//$Id: ConversationInterceptor.java,v 1.55 2006/11/17 07:12:56 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import java.lang.reflect.Method;
  @@ -89,7 +89,7 @@
      }
   
      private boolean isMissingJoin(Method method) {
  -      return Manager.instance().isLongRunningConversation() && ( 
  +      return Manager.instance().isLongRunningOrNestedConversation() && ( 
               ( 
                     method.isAnnotationPresent(Begin.class) && 
                     !method.getAnnotation(Begin.class).join() && 
  @@ -177,7 +177,7 @@
   
      private void beginConversation(boolean nested, String pageflowName)
      {
  -      if ( !Manager.instance().isLongRunningConversation() )
  +      if ( !Manager.instance().isLongRunningOrNestedConversation() )
         {
            Manager.instance().beginConversation( getComponent().getName() );
            beginNavigation(pageflowName);
  
  
  
  1.10      +3 -3      jboss-seam/src/main/org/jboss/seam/interceptors/ConversationalInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConversationalInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/ConversationalInterceptor.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- ConversationalInterceptor.java	16 Nov 2006 22:58:13 -0000	1.9
  +++ ConversationalInterceptor.java	17 Nov 2006 07:12:56 -0000	1.10
  @@ -1,4 +1,4 @@
  -//$Id: ConversationalInterceptor.java,v 1.9 2006/11/16 22:58:13 gavin Exp $
  +//$Id: ConversationalInterceptor.java,v 1.10 2006/11/17 07:12:56 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import java.lang.reflect.Method;
  @@ -86,7 +86,7 @@
      private boolean isNoConversationForConversationalBean(Method method)
      {
         boolean classlevelViolation = componentIsConversational() && 
  -            ( !Manager.instance().isLongRunningConversation() || ( componentShouldBeInitiator() && !componentIsInitiator() ) ) &&
  +            ( !Manager.instance().isLongRunningOrNestedConversation() || ( componentShouldBeInitiator() && !componentIsInitiator() ) ) &&
               !method.isAnnotationPresent(Begin.class) &&
               !method.isAnnotationPresent(StartTask.class) &&
               !method.isAnnotationPresent(BeginTask.class) &&
  @@ -96,7 +96,7 @@
         if (classlevelViolation) return true;
         
         boolean methodlevelViolation = methodIsConversational(method) &&
  -            ( !Manager.instance().isLongRunningConversation() || ( componentShouldBeInitiator(method) && !componentIsInitiator() ) );
  +            ( !Manager.instance().isLongRunningOrNestedConversation() || ( componentShouldBeInitiator(method) && !componentIsInitiator() ) );
         
         return methodlevelViolation;