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

[Gavin King]

  User: gavin   
  Date: 06/11/17 11:50:44

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  fix compile error
  
  Revision  Changes    Path
  1.120     +22 -6     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.119
  retrieving revision 1.120
  diff -u -b -r1.119 -r1.120
  --- Manager.java	17 Nov 2006 07:12:55 -0000	1.119
  +++ Manager.java	17 Nov 2006 16:50:44 -0000	1.120
  @@ -40,7 +40,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.119 $
  + * @version $Revision: 1.120 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -509,17 +509,33 @@
   
      /**
       * Initialize the request conversation context, given the 
  -    * conversation id.
  +    * conversation id. If no conversation entry is found, or
  +    * conversationId is null, initialize a new temporary
  +    * conversation context.
  +    * 
  +    * @return true if the conversation with the given id was found
  +    */
  +   public boolean restoreConversation(String conversationId)
  +   {
  +      return restoreConversation(conversationId, null, false);
  +   }
  +
  +   /**
  +    * Initialize the request conversation context, given the 
  +    * conversation id and optionally a parent conversation id.
  +    * If no conversation entry is found for the first id, try
  +    * the parent, and if that also fails, initialize a new 
  +    * temporary conversation context.
       */
  -   public boolean restoreConversation(String storedConversationId, String storedParentConversationId, boolean isLongRunningConversation) {
  +   private boolean restoreConversation(String conversationId, String parentConversationId, boolean isLongRunningConversation) {
         ConversationEntry ce = null;
  -      if (storedConversationId!=null)
  +      if (conversationId!=null)
         {
            ConversationEntries entries = ConversationEntries.instance();
  -         ce = entries.getConversationEntry(storedConversationId);
  +         ce = entries.getConversationEntry(conversationId);
            if (ce==null)
            {
  -            ce = entries.getConversationEntry(storedParentConversationId);
  +            ce = entries.getConversationEntry(parentConversationId);
            }
         }