From ce428ecfec3169f8e2fcf40fdd5360ade5818fa4 Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Wed, 16 Apr 2014 10:39:36 +0800
Subject: [PATCH] 8039853: Provider.Service.newInstance() does not work with
 current JDK JGSS Mechanisms

Reviewed-by: mullan
---
 .../share/classes/java/security/Provider.java |  2 +-
 .../java/security/Provider/NewInstance.java   | 62 +++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 jdk/test/java/security/Provider/NewInstance.java

diff --git a/jdk/src/share/classes/java/security/Provider.java b/jdk/src/share/classes/java/security/Provider.java
index 05f670c29bd..e8c7a081b5a 100644
--- a/jdk/src/share/classes/java/security/Provider.java
+++ b/jdk/src/share/classes/java/security/Provider.java
@@ -1332,7 +1332,7 @@ public abstract class Provider extends Properties {
         addEngine("SSLContext",                         false, null);
         addEngine("TrustManagerFactory",                false, null);
         // JGSS
-        addEngine("GssApiMechanism",                    true, "sun.security.jgss.GSSCaller");
+        addEngine("GssApiMechanism",                    false, null);
         // SASL
         addEngine("SaslClientFactory",                  false, null);
         addEngine("SaslServerFactory",                  false, null);
diff --git a/jdk/test/java/security/Provider/NewInstance.java b/jdk/test/java/security/Provider/NewInstance.java
new file mode 100644
index 00000000000..65fcf25f489
--- /dev/null
+++ b/jdk/test/java/security/Provider/NewInstance.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8039853
+ * @summary Provider.Service.newInstance() does not work with current
+            JDK JGSS Mechanisms
+ */
+
+import java.security.*;
+import java.util.*;
+
+public class NewInstance {
+
+    public static void main(String[] args) throws Exception {
+        for (Provider p : Security.getProviders()) {
+            System.out.println("---------");
+            System.out.println(p.getName() + ":" + p.getInfo());
+            if (p.getName().equals("SunPCSC")) {
+                System.out.println("A smartcard might not be installed. Skip test.");
+                continue;
+            }
+            Set<Provider.Service> set = p.getServices();
+            Iterator<Provider.Service> i = set.iterator();
+
+            while (i.hasNext()) {
+                Provider.Service s = i.next();
+                System.out.println(s.getType() + "." + s.getAlgorithm());
+                try {
+                    s.newInstance(null);
+                } catch (NoSuchAlgorithmException e) {
+                    System.out.println("  check");
+                    Throwable t = e.getCause();
+                    if (!(t instanceof InvalidAlgorithmParameterException)) {
+                        throw e;
+                    }
+                }
+            }
+        }
+    }
+}