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

[Gavin King]

  User: gavin   
  Date: 06/11/09 09:17:52

  Modified:    src/main/org/jboss/seam/core   Manager.java
                        ConversationEntry.java
  Log:
  fix problem in exception case
  
  Revision  Changes    Path
  1.113     +5 -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.112
  retrieving revision 1.113
  diff -u -b -r1.112 -r1.113
  --- Manager.java	4 Nov 2006 01:00:14 -0000	1.112
  +++ Manager.java	9 Nov 2006 14:17:52 -0000	1.113
  @@ -42,7 +42,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.112 $
  + * @version $Revision: 1.113 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -344,8 +344,11 @@
         ConversationEntry ce = getCurrentConversationEntry();
         if (ce!=null) 
         {
  +         if ( ce.isLockedByCurrentThread() )
  +         {
            ce.unlock();
         }
  +      }
         else if ( isNestedConversation() )
         {
            ConversationEntries.instance().getConversationEntry( getParentConversationId() ).unlock();
  
  
  
  1.29      +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.28
  retrieving revision 1.29
  diff -u -b -r1.28 -r1.29
  --- ConversationEntry.java	3 Nov 2006 23:38:27 -0000	1.28
  +++ ConversationEntry.java	9 Nov 2006 14:17:52 -0000	1.29
  @@ -239,6 +239,11 @@
         lock.unlock();
      }
      
  +   public boolean isLockedByCurrentThread()
  +   {
  +      return lock.isHeldByCurrentThread();
  +   }
  +   
      public void end()
      {
         ended = true;