billbarker 2002/09/23 23:11:59
Modified: util/java/org/apache/tomcat/util/net JSSESupport.java
Log:
Add missing try-catch block for first try at getting the client-cert.
The first call was throwing out past the second call, so the re-negotiation never
got a chance to happen.
Also reduce logging for exceptions.
Revision Changes Path
1.5 +5 -3
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/JSSESupport.java
Index: JSSESupport.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/JSSESupport.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JSSESupport.java 21 Sep 2002 04:39:33 -0000 1.4
+++ JSSESupport.java 24 Sep 2002 06:11:59 -0000 1.5
@@ -115,7 +115,11 @@
X509Certificate jsseCerts[] = null;
java.security.cert.X509Certificate x509Certs[] = null;
try {
- jsseCerts = session.getPeerCertificateChain();
+ try {
+ jsseCerts = session.getPeerCertificateChain();
+ } catch(Exception bex) {
+ // ignore.
+ }
if (jsseCerts == null)
jsseCerts = new X509Certificate[0];
if(jsseCerts.length <= 0 && force) {
@@ -138,8 +142,6 @@
x509Certs[i] = (java.security.cert.X509Certificate)
cf.generateCertificate(stream);
}
- } catch (IOException iex) {
- throw iex;
} catch (Throwable t) {
return null;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
