--- old/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyStore.java	2014-08-27 10:01:29.000000000 +0800
+++ new/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyStore.java	2014-08-27 10:01:28.000000000 +0800
@@ -196,24 +196,23 @@
             } else if (type == ATTR_CLASS_CERT) {
                 sb.append("\ttype=[trusted cert]\n");
             }
-            sb.append("\tlabel=[" + label + "]\n");
+            sb.append("\tlabel=[").append(label).append("]\n");
             if (id == null) {
                 sb.append("\tid=[null]\n");
             } else {
-                sb.append("\tid=" + P11KeyStore.getID(id) + "\n");
+                sb.append("\tid=").append(P11KeyStore.getID(id)).append('\n');
             }
-            sb.append("\ttrusted=[" + trusted + "]\n");
-            sb.append("\tmatched=[" + matched + "]\n");
+            sb.append("\ttrusted=[").append(trusted).append("]\n");
+            sb.append("\tmatched=[").append(matched).append("]\n");
             if (cert == null) {
                 sb.append("\tcert=[null]\n");
             } else {
-                sb.append("\tcert=[\tsubject: " +
-                        cert.getSubjectX500Principal() +
-                        "\n\t\tissuer: " +
-                        cert.getIssuerX500Principal() +
-                        "\n\t\tserialNum: " +
-                        cert.getSerialNumber().toString() +
-                        "]");
+                sb.append("\tcert=[\tsubject: ")
+                        .append(cert.getSubjectX500Principal())
+                        .append("\n\t\tissuer: ")
+                        .append(cert.getIssuerX500Principal())
+                        .append("\n\t\tserialNum: ")
+                        .append(cert.getSerialNumber()).append(']');
             }
             return sb.toString();
         }