From c6ac4eb557990c2e1a630faeb1c324005fc90499 Mon Sep 17 00:00:00 2001 From: Jason Uh Date: Tue, 22 Oct 2013 11:57:38 -0700 Subject: [PATCH] 8025287: NPE in api/java_security/cert/PKIXRevocationChecker/GeneralTests_GeneralTests Reviewed-by: mullan --- .../sun/security/provider/certpath/RevocationChecker.java | 2 +- .../java/security/cert/PKIXRevocationChecker/UnitTest.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jdk/src/share/classes/sun/security/provider/certpath/RevocationChecker.java b/jdk/src/share/classes/sun/security/provider/certpath/RevocationChecker.java index 0aad090a8b0..f34e737102a 100644 --- a/jdk/src/share/classes/sun/security/provider/certpath/RevocationChecker.java +++ b/jdk/src/share/classes/sun/security/provider/certpath/RevocationChecker.java @@ -307,7 +307,7 @@ class RevocationChecker extends PKIXRevocationChecker { : anchor.getCAPublicKey(); } crlSignFlag = true; - if (params.certPath() != null) { + if (params != null && params.certPath() != null) { certIndex = params.certPath().getCertificates().size() - 1; } else { certIndex = -1; diff --git a/jdk/test/java/security/cert/PKIXRevocationChecker/UnitTest.java b/jdk/test/java/security/cert/PKIXRevocationChecker/UnitTest.java index 5c5f5bcfcf0..8ddfda2429a 100644 --- a/jdk/test/java/security/cert/PKIXRevocationChecker/UnitTest.java +++ b/jdk/test/java/security/cert/PKIXRevocationChecker/UnitTest.java @@ -23,7 +23,7 @@ /** * @test - * @bug 6854712 7171570 8010748 + * @bug 6854712 7171570 8010748 8025287 * @summary Basic unit test for PKIXRevocationChecker */ @@ -44,6 +44,8 @@ public class UnitTest { CertPathChecker cpc = cpv.getRevocationChecker(); PKIXRevocationChecker prc = (PKIXRevocationChecker)cpc; + prc.init(false); + System.out.println("Testing that get methods return null or " + "empty lists/sets/maps"); requireNull(prc.getOcspResponder(), "getOcspResponder()");