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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/10/04 21:11:39

  Modified:    src/main/org/jboss/seam/web  ExceptionFilter.java
  Log:
  JBSEAM-1995
  
  Revision  Changes    Path
  1.25      +11 -4     jboss-seam/src/main/org/jboss/seam/web/ExceptionFilter.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ExceptionFilter.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/ExceptionFilter.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -b -r1.24 -r1.25
  --- ExceptionFilter.java	21 Jul 2007 05:41:37 -0000	1.24
  +++ ExceptionFilter.java	5 Oct 2007 01:11:39 -0000	1.25
  @@ -90,16 +90,23 @@
         if ( !Contexts.isEventContextActive() )
         {
            Manager oldManager =  (Manager) request.getAttribute( Seam.getComponentName(Manager.class) );
  -         conversationId = oldManager.getCurrentConversationId(); 
  +         if (oldManager != null) conversationId = oldManager.getCurrentConversationId(); 
         }
         
         //Initialize the temporary context objects
         FacesLifecycle.beginExceptionRecovery( facesContext.getExternalContext() );
         
         //If there is an existing long-running conversation on
  -      //the failed request, propagate it
  +      //the failed request, propagate it, otherwise initialize a temporary conversation      
  +      if (conversationId != null)
  +      {
         ConversationPropagation.instance().setConversationId(conversationId);
         Manager.instance().restoreConversation();
  +      }
  +      else
  +      {
  +         Manager.instance().initializeTemporaryConversation();
  +      }
         
         //Now do the exception handling
         try