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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/01/25 11:40:46

  Modified:    src/main/org/jboss/seam/exceptions  RedirectHandler.java
  Log:
  moved page security config to pages.xml
  
  Revision  Changes    Path
  1.2       +18 -18    jboss-seam/src/main/org/jboss/seam/exceptions/RedirectHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RedirectHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/exceptions/RedirectHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- RedirectHandler.java	17 Dec 2006 19:46:41 -0000	1.1
  +++ RedirectHandler.java	25 Jan 2007 16:40:46 -0000	1.2
  @@ -1,8 +1,7 @@
   package org.jboss.seam.exceptions;
  -
  +import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.core.Conversation;
   import org.jboss.seam.util.Transactions;
  -
   public abstract class RedirectHandler extends ExceptionHandler
   {
      
  @@ -10,10 +9,11 @@
      public Object handle(Exception e) throws Exception
      {
         addFacesMessage( e, getMessage(e) );
  -      if ( isEnd(e) ) Conversation.instance().end();
  +      
  +      if (Contexts.isConversationContextActive() && isEnd(e) ) Conversation.instance().end();
         if ( isRollback(e) ) Transactions.setTransactionRollbackOnly();
  +      
         redirect( getViewId(e), null );
         return rethrow(e);
      }
  -
   }
  \ No newline at end of file