Merge
authormduigou
Thu, 20 Jun 2013 08:21:08 -0700
changeset 18533 87bd724bfc25
parent 18532 0bbca0914946 (current diff)
parent 18531 bd30cde9e64a (diff)
child 18534 2d131cf5db63
Merge
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/RejectClientRenego.java	Thu Jun 20 07:23:51 2013 -0700
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/RejectClientRenego.java	Thu Jun 20 08:21:08 2013 -0700
@@ -131,7 +131,7 @@
                 sslOS.flush();
             }
             throw new Exception("Not reject client initialized renegotiation");
-        } catch (SSLHandshakeException she) {
+        } catch (IOException ioe) {
             System.out.println("Got the expected exception");
         } finally {
             sslSocket.close();
@@ -181,7 +181,7 @@
                 sslIS.read();
             }
             throw new Exception("Not reject client initialized renegotiation");
-        } catch (SSLHandshakeException she) {
+        } catch (IOException ioe) {
             System.out.println("Got the expected exception");
         } finally {
             sslSocket.close();