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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/11/29 17:03:54

  Modified:    src/main/org/jboss/seam/core  ConversationInterceptor.java
  Log:
  JBSEAM-2124
  
  Revision  Changes    Path
  1.5       +2 -3      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.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- ConversationInterceptor.java	12 Oct 2007 04:20:41 -0000	1.4
  +++ ConversationInterceptor.java	29 Nov 2007 22:03:54 -0000	1.5
  @@ -1,4 +1,4 @@
  -//$Id: ConversationInterceptor.java,v 1.4 2007/10/12 04:20:41 dallen Exp $
  +//$Id: ConversationInterceptor.java,v 1.5 2007/11/29 22:03:54 sbryzak2 Exp $
   package org.jboss.seam.core;
   
   import java.lang.reflect.Method;
  @@ -88,12 +88,11 @@
         if ( !Manager.instance().isLongRunningConversation() )
         {
            String id = null;
  -         String conversation = null;
  +         String conversation = ConversationPropagation.instance().getConversationName();
            
            if ( method.isAnnotationPresent(Begin.class) )
            {
               id = method.getAnnotation(Begin.class).id();
  -            conversation = method.getAnnotation(Begin.class).conversation();
            }
            else if ( method.isAnnotationPresent(BeginTask.class) )
            {