changeset 12428:9a05d7e16d8e

8131735: closed/sun/security/ssl/SSLSessionImpl/RemovedPrivateKey.java is failing Reviewed-by: vinnie
author weijun
date Fri, 17 Jul 2015 19:40:25 +0800
parents 3704b4f8b2be
children 5f7e9ef899f9 c2e706c73dd5
files src/java.security.jgss/share/classes/sun/security/krb5/internal/ssl/Krb5KeyExchangeService.java
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/ssl/Krb5KeyExchangeService.java	Fri Jul 17 10:37:25 2015 +0100
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ssl/Krb5KeyExchangeService.java	Fri Jul 17 19:40:25 2015 +0800
@@ -83,6 +83,12 @@
                     (PrivilegedExceptionAction<ServiceCreds>)
                             () -> Krb5Util.getServiceCreds(
                                     GSSCaller.CALLER_SSL_SERVER, null, acc));
+            if (serviceCreds == null) {
+                if (debug != null && Debug.isOn("handshake")) {
+                    System.out.println("Kerberos serviceCreds not available");
+                }
+                return null;
+            }
             if (debug != null && Debug.isOn("handshake")) {
                 System.out.println("Using Kerberos creds");
             }