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/26 00:20:51 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/net SSLSocketFactory.java
costin 00/07/25 15:20:51
Modified: src/share/org/apache/tomcat/net Tag: tomcat_32
SSLSocketFactory.java
Log:
Debugging fixes.
Revision Changes Path
No revision
No revision
1.2.2.1 +14 -7 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.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SSLSocketFactory.java 2000/07/01 00:43:25 1.2
+++ SSLSocketFactory.java 2000/07/25 22:20:50 1.2.2.1
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/net/SSLSocketFactory.java,v 1.2.2.1 2000/07/25 22:20:50 costin Exp $
+ * $Revision: 1.2.2.1 $
+ * $Date: 2000/07/25 22:20:50 $
*
* ====================================================================
*
@@ -181,7 +181,6 @@
return;
} catch(Exception e) {
- // e.printStackTrace();
if( e instanceof IOException )
throw (IOException)e;
throw new IOException(e.getMessage());
@@ -213,9 +212,17 @@
istream = new FileInputStream(keystoreFile);
kstore.load(istream, keyPass.toCharArray());
return kstore;
- } catch(Exception ex) {
- // ex.printStackTrace();
- throw new IOException( "Can't load server certificate" );
}
+ catch (FileNotFoundException fnfe) {
+ throw fnfe;
+ }
+ catch (IOException ioe) {
+ throw ioe;
+ }
+ catch(Exception ex) {
+ throw new IOException( "Exception trying to load keystore " + keystoreFile + ": " + ex.getMessage() );
+ }
}
+
+
}
Re: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/net SSLSocketFactory.java
Posted by Warner Onstine <on...@intalio.com>.
Were my changes ever commited?
-warner
----- Original Message -----
From: <co...@locus.apache.org>
To: <ja...@apache.org>
Sent: Tuesday, July 25, 2000 3:20 PM
Subject: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/net
SSLSocketFactory.java
> costin 00/07/25 15:20:51
>
> Modified: src/share/org/apache/tomcat/net Tag: tomcat_32
> SSLSocketFactory.java
> Log:
> Debugging fixes.
>
> Revision Changes Path
> No revision
>
>
> No revision
>
>
> 1.2.2.1 +14 -7
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.ja
va,v
> retrieving revision 1.2
> retrieving revision 1.2.2.1
> diff -u -r1.2 -r1.2.2.1
> --- SSLSocketFactory.java 2000/07/01 00:43:25 1.2
> +++ SSLSocketFactory.java 2000/07/25 22:20:50 1.2.2.1
> @@ -1,7 +1,7 @@
> /*
> - * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/net/SSLSocketFactory.ja
va,v 1.2 2000/07/01 00:43:25 costin Exp $
> - * $Revision: 1.2 $
> - * $Date: 2000/07/01 00:43:25 $
> + * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/net/SSLSocketFactory.ja
va,v 1.2.2.1 2000/07/25 22:20:50 costin Exp $
> + * $Revision: 1.2.2.1 $
> + * $Date: 2000/07/25 22:20:50 $
> *
> * ====================================================================
> *
> @@ -181,7 +181,6 @@
>
> return;
> } catch(Exception e) {
> - // e.printStackTrace();
> if( e instanceof IOException )
> throw (IOException)e;
> throw new IOException(e.getMessage());
> @@ -213,9 +212,17 @@
> istream = new FileInputStream(keystoreFile);
> kstore.load(istream, keyPass.toCharArray());
> return kstore;
> - } catch(Exception ex) {
> - // ex.printStackTrace();
> - throw new IOException( "Can't load server certificate" );
> }
> + catch (FileNotFoundException fnfe) {
> + throw fnfe;
> + }
> + catch (IOException ioe) {
> + throw ioe;
> + }
> + catch(Exception ex) {
> + throw new IOException( "Exception trying to load keystore " +
keystoreFile + ": " + ex.getMessage() );
> + }
> }
> +
> +
> }
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org