You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@locus.apache.org on 2000/07/01 02:43:29 UTC

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/startup EmbededTomcat.java

costin      00/06/30 17:43:29

  Modified:    src/share/org/apache/tomcat/core Context.java
               src/share/org/apache/tomcat/net SSLSocketFactory.java
               src/share/org/apache/tomcat/startup EmbededTomcat.java
  Log:
  Less output - don't display full stack trace if certificate is not found
  ( just 1 line reporting the event ).
  
  Revision  Changes    Path
  1.100     +3 -0      jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java
  
  Index: Context.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java,v
  retrieving revision 1.99
  retrieving revision 1.100
  diff -u -r1.99 -r1.100
  --- Context.java	2000/06/22 23:30:45	1.99
  +++ Context.java	2000/07/01 00:43:22	1.100
  @@ -426,6 +426,9 @@
           this.isDistributable = isDistributable;
       }
   
  +    public void setDistributable(String s) {
  +	// XXX
  +    }
   
       public int getSessionTimeOut() {
           return this.sessionTimeOut;
  
  
  
  1.2       +5 -5      jakarta-tomcat/src/share/org/apache/tomcat/net/SSLSocketFactory.java
  
  Index: SSLSocketFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/net/SSLSocketFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SSLSocketFactory.java	2000/06/14 19:07:19	1.1
  +++ SSLSocketFactory.java	2000/07/01 00:43:25	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/net/SSLSocketFactory.java,v 1.1 2000/06/14 19:07:19 costin Exp $
  - * $Revision: 1.1 $
  - * $Date: 2000/06/14 19:07:19 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/net/SSLSocketFactory.java,v 1.2 2000/07/01 00:43:25 costin Exp $
  + * $Revision: 1.2 $
  + * $Date: 2000/07/01 00:43:25 $
    *
    * ====================================================================
    *
  @@ -181,7 +181,7 @@
   
   	    return;
   	} catch(Exception e) {
  -	    e.printStackTrace();
  +	    //	    e.printStackTrace();
   	    if( e instanceof IOException )
   		throw (IOException)e;
   	    throw new IOException(e.getMessage());
  @@ -214,7 +214,7 @@
   	    kstore.load(istream, keyPass.toCharArray());
   	    return kstore;
   	} catch(Exception ex) {
  -	    ex.printStackTrace();
  +	    //	    ex.printStackTrace();
   	    throw new IOException( "Can't load server certificate" );
   	}
       }
  
  
  
  1.13      +2 -0      jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java
  
  Index: EmbededTomcat.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- EmbededTomcat.java	2000/06/30 20:21:48	1.12
  +++ EmbededTomcat.java	2000/07/01 00:43:29	1.13
  @@ -262,6 +262,8 @@
       public void start() {
   	try {
   	    contextM.start();
  +	} catch( IOException ex ) {
  +	    System.out.println("Error starting endpoing " + ex.toString());
   	} catch( Exception ex ) {
   	    ex.printStackTrace();
   	}