tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/server JNIEndpoint.java
Date Sat, 25 Aug 2001 18:15:17 GMT
costin      01/08/25 11:15:17

  Modified:    src/share/org/apache/tomcat/modules/server JNIEndpoint.java
  Log:
  Bug 3086 - add a mechansim to specify the timeout on the jni startup thread.
  
  Revision  Changes    Path
  1.5       +19 -4     jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIEndpoint.java
  
  Index: JNIEndpoint.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIEndpoint.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JNIEndpoint.java	2001/08/24 01:15:18	1.4
  +++ JNIEndpoint.java	2001/08/25 18:15:17	1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIEndpoint.java,v
1.4 2001/08/24 01:15:18 costin Exp $
  - * $Revision: 1.4 $
  - * $Date: 2001/08/24 01:15:18 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIEndpoint.java,v
1.5 2001/08/25 18:15:17 costin Exp $
  + * $Revision: 1.5 $
  + * $Date: 2001/08/25 18:15:17 $
    *
    * ====================================================================
    *
  @@ -121,6 +121,21 @@
   	return ep;
       }
   
  +    public static final int DEFAULT_TIMEOUT=60*1000;
  +    
  +    public static int getTimeout() {
  +	// # 3086
  +	String to=System.getProperty("JNIEndpoint.timeout");
  +	if( to!=null ) {
  +	    try {
  +		int i=new Integer( to ).intValue();
  +		return i;
  +	    } catch( Exception ex ){
  +		System.out.println("Invalid timeout " + to );
  +	    }
  +	}
  +	return DEFAULT_TIMEOUT;
  +    }
   
       // -------------------- JNI Entry points
   
  @@ -154,7 +169,7 @@
   	    System.err.println("Starting up StartupThread");
               startup.start();
               synchronized (this) {
  -                wait(60*1000);
  +                wait(getTimeout());
               }
   	    System.err.println("End waiting");
           } catch(Throwable t) {
  
  
  

Mime
View raw message