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

[Gavin King]

  User: gavin   
  Date: 06/11/02 14:28:14

  Modified:    src/main/org/jboss/seam/core   ConversationEntry.java
                        Manager.java
  Log:
  fix bug in locking of nested conversations
  
  Revision  Changes    Path
  1.27      +5 -0      jboss-seam/src/main/org/jboss/seam/core/ConversationEntry.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConversationEntry.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ConversationEntry.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -b -r1.26 -r1.27
  --- ConversationEntry.java	31 Oct 2006 22:29:40 -0000	1.26
  +++ ConversationEntry.java	2 Nov 2006 19:28:14 -0000	1.27
  @@ -231,6 +231,11 @@
         return ended;
      }
   
  +   public boolean isNested()
  +   {
  +      return conversationIdStack.size()>1;
  +   }
  +
      @Override
      public String toString()
      {
  
  
  
  1.108     +8 -2      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.107
  retrieving revision 1.108
  diff -u -b -r1.107 -r1.108
  --- Manager.java	31 Oct 2006 22:29:40 -0000	1.107
  +++ Manager.java	2 Nov 2006 19:28:14 -0000	1.108
  @@ -43,7 +43,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.107 $
  + * @version $Revision: 1.108 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -628,7 +628,13 @@
      {
         ConversationEntry entry = ConversationEntries.instance()
               .createConversationEntry( getCurrentConversationId(), getCurrentConversationIdStack() );
  +      if ( !entry.isNested() ) 
  +      {
  +         //if it is a newly created nested 
  +         //conversation, we already own the
  +         //lock
         entry.lock();
  +      }
         return entry;
      }