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

[Gavin King]

  User: gavin   
  Date: 06/10/12 21:27:31

  Modified:    src/main/org/jboss/seam/core   ConversationEntry.java
                        Manager.java
  Log:
  use Semaphore in @Synchronized
  
  Revision  Changes    Path
  1.22      +1 -1      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.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- ConversationEntry.java	13 Oct 2006 01:12:45 -0000	1.21
  +++ ConversationEntry.java	13 Oct 2006 01:27:31 -0000	1.22
  @@ -180,7 +180,7 @@
      {
         try
         {
  -         return semaphore.tryAcquire( Manager.instance().getRequestWait(), TimeUnit.MILLISECONDS );
  +         return semaphore.tryAcquire( Manager.instance().getConcurrentRequestTimeout(), TimeUnit.MILLISECONDS );
         }
         catch (InterruptedException ie)
         {
  
  
  
  1.95      +6 -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.94
  retrieving revision 1.95
  diff -u -b -r1.94 -r1.95
  --- Manager.java	13 Oct 2006 01:12:45 -0000	1.94
  +++ Manager.java	13 Oct 2006 01:27:31 -0000	1.95
  @@ -41,7 +41,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.94 $
  + * @version $Revision: 1.95 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -71,7 +71,7 @@
      private boolean destroyBeforeRedirect;
      
      private int conversationTimeout = 600000; //10 mins
  -   private int requestWait = 1000; //one second
  +   private int concurrentRequestTimeout = 1000; //one second
      
      private String conversationIdParameter = "conversationId";
      private String conversationIsLongRunningParameter = "conversationIsLongRunning";
  @@ -992,14 +992,14 @@
         this.updateModelValuesCalled = updateModelValuesCalled;
      }
   
  -   public int getRequestWait()
  +   public int getConcurrentRequestTimeout()
      {
  -      return requestWait;
  +      return concurrentRequestTimeout;
      }
   
  -   public void setRequestWait(int requestWait)
  +   public void setConcurrentRequestTimeout(int requestWait)
      {
  -      this.requestWait = requestWait;
  +      this.concurrentRequestTimeout = requestWait;
      }
   
   }