From 6285eefda64604b9cb5dde9c3990a2281b678528 Mon Sep 17 00:00:00 2001
From: xuelei <unknown>
Date: Fri, 11 Apr 2008 03:43:18 -0400
Subject: [PATCH] 6546671:
 (spec)javax.net.ssl.TrustManagerFactory.getInstance() throws undocumented NP
 5053895: (spec) Unspecified IllegalStateException in TrustManagerFactory
 Summary: add NullPointerException/IllegalStateException description
 Reviewed-by: weijun

---
 src/share/classes/javax/net/ssl/TrustManagerFactory.java   | 7 ++++++-
 .../classes/javax/net/ssl/TrustManagerFactorySpi.java      | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/share/classes/javax/net/ssl/TrustManagerFactory.java b/src/share/classes/javax/net/ssl/TrustManagerFactory.java
index ecbfab5cb..ac59beec0 100644
--- a/src/share/classes/javax/net/ssl/TrustManagerFactory.java
+++ b/src/share/classes/javax/net/ssl/TrustManagerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -129,6 +129,7 @@ public class TrustManagerFactory {
      * @exception NoSuchAlgorithmException if no Provider supports a
      *          TrustManagerFactorySpi implementation for the
      *          specified algorithm.
+     * @exception NullPointerException if algorithm is null.
      *
      * @see java.security.Provider
      */
@@ -171,6 +172,7 @@ public class TrustManagerFactory {
      *          registered in the security provider list.
      *
      * @throws IllegalArgumentException if the provider name is null or empty.
+     * @throws NullPointerException if algorithm is null.
      *
      * @see java.security.Provider
      */
@@ -208,6 +210,7 @@ public class TrustManagerFactory {
      *          from the specified Provider object.
      *
      * @throws IllegalArgumentException if the provider is null.
+     * @throws NullPointerException if algorithm is null.
      *
      * @see java.security.Provider
      */
@@ -274,6 +277,8 @@ public class TrustManagerFactory {
     /**
      * Returns one trust manager for each type of trust material.
      *
+     * @throws IllegalStateException if the factory is not initialized.
+     *
      * @return the trust managers
      */
     public final TrustManager[] getTrustManagers() {
diff --git a/src/share/classes/javax/net/ssl/TrustManagerFactorySpi.java b/src/share/classes/javax/net/ssl/TrustManagerFactorySpi.java
index 0554d8f60..2167124db 100644
--- a/src/share/classes/javax/net/ssl/TrustManagerFactorySpi.java
+++ b/src/share/classes/javax/net/ssl/TrustManagerFactorySpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2001 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,6 +74,8 @@ public abstract class TrustManagerFactorySpi {
     /**
      * Returns one trust manager for each type of trust material.
      *
+     * @throws IllegalStateException if the factory is not initialized.
+     *
      * @return the trust managers
      */
     protected abstract TrustManager[] engineGetTrustManagers();
-- 
GitLab