Index: org/apache/jasper/runtime/JspRuntimeLibrary.java
===================================================================
--- org/apache/jasper/runtime/JspRuntimeLibrary.java	(revision 831814)
+++ org/apache/jasper/runtime/JspRuntimeLibrary.java	(working copy)
@@ -989,7 +989,7 @@
 	    enc = "ISO-8859-1";	// The default request encoding 
 	}
 
-	StringBuffer out = new StringBuffer(s.length());
+	StringBuilder out = new StringBuilder(s.length());
 	ByteArrayOutputStream buf = new ByteArrayOutputStream();
 	OutputStreamWriter writer = null;
 	try {
Index: org/apache/jasper/runtime/PageContextImpl.java
===================================================================
--- org/apache/jasper/runtime/PageContextImpl.java	(revision 831814)
+++ org/apache/jasper/runtime/PageContextImpl.java	(working copy)
@@ -866,7 +866,7 @@
 	private static String XmlEscape(String s) {
 		if (s == null)
 			return null;
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		for (int i = 0; i < s.length(); i++) {
 			char c = s.charAt(i);
 			if (c == '<') {