--- old/src/java.base/share/classes/sun/security/x509/AVA.java 2014-08-26 11:21:22.000000000 +0800 +++ new/src/java.base/share/classes/sun/security/x509/AVA.java 2014-08-26 11:21:22.000000000 +0800 @@ -1062,7 +1062,7 @@ } else { boolean quoteNeeded = false; - StringBuilder sbuffer = new StringBuilder(); + StringBuilder sb = new StringBuilder(); boolean previousWhite = false; final String escapees = ",+=\n<>#;\\\""; @@ -1079,7 +1079,7 @@ for (int i = 0; i < length; i++) { char c = valStr.charAt(i); if (alreadyQuoted && (i == 0 || i == length - 1)) { - sbuffer.append(c); + sb.append(c); continue; } if (DerValue.isPrintableStringChar(c) || @@ -1096,7 +1096,7 @@ if (!(c == ' ' || c == '\n')) { // escape '"' and '\' if (c == '"' || c == '\\') { - sbuffer.append('\\'); + sb.append('\\'); } previousWhite = false; } else { @@ -1106,7 +1106,7 @@ previousWhite = true; } - sbuffer.append(c); + sb.append(c); } else if (debug != null && Debug.isOn("ava")) { @@ -1119,26 +1119,26 @@ byte[] valueBytes = Character.toString(c).getBytes("UTF8"); for (int j = 0; j < valueBytes.length; j++) { - sbuffer.append('\\'); + sb.append('\\'); char hexChar = Character.forDigit (0xF & (valueBytes[j] >>> 4), 16); - sbuffer.append(Character.toUpperCase(hexChar)); + sb.append(Character.toUpperCase(hexChar)); hexChar = Character.forDigit (0xF & (valueBytes[j]), 16); - sbuffer.append(Character.toUpperCase(hexChar)); + sb.append(Character.toUpperCase(hexChar)); } } else { // append non-printable/non-escaped char previousWhite = false; - sbuffer.append(c); + sb.append(c); } } // quote if trailing whitespace - if (sbuffer.length() > 0) { - char trailChar = sbuffer.charAt(sbuffer.length() - 1); + if (sb.length() > 0) { + char trailChar = sb.charAt(sb.length() - 1); if (trailChar == ' ' || trailChar == '\n') { quoteNeeded = true; } @@ -1147,9 +1147,9 @@ // Emit the string ... quote it if needed // if string is already quoted, don't re-quote if (!alreadyQuoted && quoteNeeded) { - retval.append("\"" + sbuffer.toString() + "\""); + retval.append('"').append(sb).append('"'); } else { - retval.append(sbuffer.toString()); + retval.append(sb); } } } catch (IOException e) {