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

[Gavin King]

  User: gavin   
  Date: 07/06/18 01:12:19

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  deprecate end() on exception annotations
  tolerate multiple calls to begin()/end(), esp for @ApplicationException
  
  Revision  Changes    Path
  1.172     +18 -13    jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.171
  retrieving revision 1.172
  diff -u -b -r1.171 -r1.172
  --- Manager.java	15 Jun 2007 03:50:16 -0000	1.171
  +++ Manager.java	18 Jun 2007 05:12:19 -0000	1.172
  @@ -42,7 +42,6 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.171 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -566,6 +565,8 @@
      @SuppressWarnings("deprecation")
      public void beginConversation(String initiator)
      {
  +      if ( !isLongRunningConversation() )
  +      {
         log.debug("Beginning long-running conversation");
         setLongRunningConversation(true);
         createConversationEntry().setInitiatorComponentName(initiator);
  @@ -573,6 +574,7 @@
         storeConversationToViewRootIfNecessary();
         if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.beginConversation");
      }
  +   }
   
      /**
       * Begin a new nested conversation.
  @@ -602,6 +604,8 @@
       */
      public void endConversation(boolean beforeRedirect)
      {
  +      if ( isLongRunningConversation() )
  +      {
         log.debug("Ending long-running conversation");
         if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.endConversation");
         setLongRunningConversation(false);
  @@ -609,6 +613,7 @@
         endNestedConversations( getCurrentConversationId() );
         storeConversationToViewRootIfNecessary();
      }
  +   }
      
      private void storeConversationToViewRootIfNecessary()
      {