[Winstone-devel] winstone/src/java/winstone LocalStrings.properties,1.36,1.37 Launcher.java,1.16,1.17 ObjectPool.java,1.4,1.5

[Rick K. <ric...@us...>]

Update of /cvsroot/winstone/winstone/src/java/winstone
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25179/src/java/winstone

Modified Files:
	LocalStrings.properties Launcher.java ObjectPool.java 
Log Message:
Upgraded version numbers and changed control port timeout to 5s instead of 10ms. This will stop contention over the object pool as well

Index: LocalStrings.properties
===================================================================
RCS file: /cvsroot/winstone/winstone/src/java/winstone/LocalStrings.properties,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** LocalStrings.properties	13 Jan 2006 17:40:54 -0000	1.36
--- LocalStrings.properties	15 Jan 2006 08:34:53 -0000	1.37
***************
*** 1,3 ****
! ServerVersion=Winstone Servlet Engine v0.8
  WebAppConfig.DefaultMimeTypes=jpg=image/jpeg:jpeg=image/jpeg:gif=image/gif:css=text/css:js=text/javascript:txt=text/plain
  
--- 1,3 ----
! ServerVersion=Winstone Servlet Engine v0.8.1-cvs
  WebAppConfig.DefaultMimeTypes=jpg=image/jpeg:jpeg=image/jpeg:gif=image/gif:css=text/css:js=text/javascript:txt=text/plain
  

Index: Launcher.java
===================================================================
RCS file: /cvsroot/winstone/winstone/src/java/winstone/Launcher.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Launcher.java	3 Jan 2006 16:51:02 -0000	1.16
--- Launcher.java	15 Jan 2006 08:34:53 -0000	1.17
***************
*** 56,60 ****
      public static final byte RELOAD_TYPE = (byte) '4';
      
!     private int CONTROL_TIMEOUT = 10; // wait 5s for control connection
      private int DEFAULT_CONTROL_PORT = -1;
      
--- 56,60 ----
      public static final byte RELOAD_TYPE = (byte) '4';
      
!     private int CONTROL_TIMEOUT = 5000; // wait 5s for control connection
      private int DEFAULT_CONTROL_PORT = -1;
      

Index: ObjectPool.java
===================================================================
RCS file: /cvsroot/winstone/winstone/src/java/winstone/ObjectPool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ObjectPool.java	27 Dec 2005 14:35:53 -0000	1.4
--- ObjectPool.java	15 Jan 2006 08:34:53 -0000	1.5
***************
*** 25,29 ****
  import java.util.List;
  import java.util.Map;
- import java.util.Vector;
  
  /**
--- 25,28 ----
***************
*** 63,68 ****
  
          // Build the initial pool of handler threads
!         this.unusedRequestHandlerThreads = new Vector();
!         this.usedRequestHandlerThreads = new Vector();
  
          // Build the request/response pools
--- 62,67 ----
  
          // Build the initial pool of handler threads
!         this.unusedRequestHandlerThreads = new ArrayList();
!         this.usedRequestHandlerThreads = new ArrayList();
  
          // Build the request/response pools
***************
*** 101,106 ****
              // If we have too many idle request handlers
              while (this.unusedRequestHandlerThreads.size() > MAX_IDLE_REQUEST_HANDLERS_IN_POOL) {
!                 RequestHandlerThread rh = (RequestHandlerThread) this.unusedRequestHandlerThreads
!                         .get(0);
                  rh.destroy();
                  this.unusedRequestHandlerThreads.remove(rh);
--- 100,104 ----
              // If we have too many idle request handlers
              while (this.unusedRequestHandlerThreads.size() > MAX_IDLE_REQUEST_HANDLERS_IN_POOL) {
!                 RequestHandlerThread rh = (RequestHandlerThread) this.unusedRequestHandlerThreads.get(0);
                  rh.destroy();
                  this.unusedRequestHandlerThreads.remove(rh);
***************
*** 111,120 ****
      public void destroy() {
          synchronized (this.requestHandlerSemaphore) {
!             Collection usedHandlers = new ArrayList(
!                     this.usedRequestHandlerThreads);
              for (Iterator i = usedHandlers.iterator(); i.hasNext();)
                  releaseRequestHandler((RequestHandlerThread) i.next());
!             Collection unusedHandlers = new ArrayList(
!                     this.unusedRequestHandlerThreads);
              for (Iterator i = unusedHandlers.iterator(); i.hasNext();)
                  ((RequestHandlerThread) i.next()).destroy();
--- 109,116 ----
      public void destroy() {
          synchronized (this.requestHandlerSemaphore) {
!             Collection usedHandlers = new ArrayList(this.usedRequestHandlerThreads);
              for (Iterator i = usedHandlers.iterator(); i.hasNext();)
                  releaseRequestHandler((RequestHandlerThread) i.next());
!             Collection unusedHandlers = new ArrayList(this.unusedRequestHandlerThreads);
              for (Iterator i = unusedHandlers.iterator(); i.hasNext();)
                  ((RequestHandlerThread) i.next()).destroy();
***************
*** 134,139 ****
              // If we have any spare, get it from the pool
              if (this.unusedRequestHandlerThreads.size() > 0) {
!                 rh = (RequestHandlerThread) this.unusedRequestHandlerThreads
!                         .get(0);
                  this.unusedRequestHandlerThreads.remove(rh);
                  this.usedRequestHandlerThreads.add(rh);
--- 130,134 ----
              // If we have any spare, get it from the pool
              if (this.unusedRequestHandlerThreads.size() > 0) {
!                 rh = (RequestHandlerThread) this.unusedRequestHandlerThreads.get(0);
                  this.unusedRequestHandlerThreads.remove(rh);
                  this.usedRequestHandlerThreads.add(rh);