--- a/jdk/src/share/classes/java/security/Permission.java	Fri Feb 27 16:34:19 2009 -0800
+++ b/jdk/src/share/classes/java/security/Permission.java	Mon Mar 02 23:17:53 2009 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -214,18 +214,18 @@
     /**
      * Returns a string describing this Permission.  The convention is to
      * specify the class name, the permission name, and the actions in
-     * the following format: '("ClassName" "name" "actions")'.
+     * the following format: '("ClassName" "name" "actions")', or
+     * '("ClassName" "name")' if actions list is null or empty.
      *
      * @return information about this Permission.
      */
-
     public String toString() {
         String actions = getActions();
         if ((actions == null) || (actions.length() == 0)) { // OPTIONAL
-            return "(" + getClass().getName() + " " + name + ")";
+            return "(\"" + getClass().getName() + "\" \"" + name + "\")";
         } else {
-            return "(" + getClass().getName() + " " + name + " " +
-                actions + ")";
+            return "(\"" + getClass().getName() + "\" \"" + name +
+                 "\" \"" + actions + "\")";
         }
     }
 }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/security/Permission/ToString.java	Mon Mar 02 23:17:53 2009 +0800
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2009 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 6549506
+ * @summary Specification of Permission.toString() method contradicts with
+ *      JDK implementation
+ */
+
+import java.security.*;
+
+public class ToString {
+
+    public static void main(String[]args) throws Exception {
+        DummyWritePermission dummyPerm = new DummyWritePermission();
+        NullActionPermission nullActionPerm = new NullActionPermission();
+        System.out.println(dummyPerm.toString());
+        System.out.println(dummyPerm.getDescription());
+        System.out.println(nullActionPerm.toString());
+        System.out.println(nullActionPerm.getDescription());
+        if (!dummyPerm.toString().equals(dummyPerm.getDescription())) {
+            throw new Exception("The expected permission.toString() is " +
+                dummyPerm.getDescription() + ", but " +
+                dummyPerm.toString() + " returned!");
+        }
+
+        if (!nullActionPerm.toString().equals(nullActionPerm.getDescription())) {
+            throw new Exception("The expected permission.toString() is " +
+                nullActionPerm.getDescription() + ", but " +
+                nullActionPerm.toString() + " returned!");
+        }
+    }
+
+    private static abstract class SimplePermission extends Permission {
+        public SimplePermission(String name) {
+            super(name);
+        }
+
+        public boolean implies(Permission permission) {
+            return false;
+        }
+
+        public boolean equals(Object obj) {
+            return false;
+        }
+
+        public int hashCode() {
+            return 13;
+        }
+    }
+
+    private static class DummyWritePermission extends SimplePermission {
+        public DummyWritePermission() {
+            super("permit to");
+        }
+
+        public String getActions() {
+            return "write";
+        }
+
+        public String getDescription() {
+            return "(\"ToString$DummyWritePermission\" \"permit to\" \"write\")";
+        }
+    }
+
+    private static class NullActionPermission extends SimplePermission {
+        public NullActionPermission() {
+            super("permit to");
+        }
+
+        public String getActions() {
+            return null;
+        }
+
+        public String getDescription() {
+            return "(\"ToString$NullActionPermission\" \"permit to\")";
+        }
+    }
+
+}