diff -r fd16c54261b3 -r 90ce3da70b43 jdk/test/java/security/ProtectionDomain/RecursionDebug.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/security/ProtectionDomain/RecursionDebug.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2003-2004 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
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4947618
+ * @summary Recursion problem in security manager and policy code
+ *
+ * @run main/othervm/policy=Recursion.policy -Djava.security.debug=domain RecursionDebug
+ */
+
+import java.security.*;
+import java.net.*;
+
+public class RecursionDebug {
+
+    // non bootclasspath SecurityManager
+    public static class RecursionSM extends SecurityManager {
+        public void checkPermission(Permission p) {
+            super.checkPermission(p);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+
+        // trigger security check to make sure policy is set
+        try {
+            System.getProperty("foo.bar");
+        } catch (Exception e) {
+            // fall thru
+        }
+
+        // static perms
+        Permissions staticPerms = new Permissions();
+        staticPerms.add(new java.util.PropertyPermission("static.foo", "read"));
+
+        ProtectionDomain pd = new ProtectionDomain
+                        (new CodeSource
+                                (new URL("http://foo"),
+                                (java.security.cert.Certificate[])null),
+                        staticPerms,
+                        null,
+                        null);
+
+        // test with SecurityManager on the bootclasspath, debug turned on
+        //
+        // merging should have occured - check for policy merged.foo permission
+
+        if (pd.toString().indexOf("merged.foo") < 0) {
+            throw new Exception("Test with bootclass SecurityManager failed");
+        }
+
+        // test with SecurityManager not on bootclasspath, debug turned on
+        //
+        // merging should not have occured, and there should be no recursion
+
+        ProtectionDomain pd2 = new ProtectionDomain
+                        (new CodeSource
+                                (new URL("http://bar"),
+                                (java.security.cert.Certificate[])null),
+                        staticPerms,
+                        null,
+                        null);
+
+        System.setSecurityManager(new RecursionDebug.RecursionSM());
+        if (pd2.toString().indexOf("merged.foo") >= 0) {
+            throw new Exception
+                ("Test with custom non-bootclass SecurityManager failed");
+        }
+
+        System.setSecurityManager(null);
+    }
+}