Port performance improvements on getBytes from Tomcat

Kin Man Chung · Kin Man Chung · commit 9645cdeecf4a · 2011-11-30T23:38:09.000Z
svn path=/trunk/; revision=1413
diff --git a/impl/src/main/java/org/apache/jasper/compiler/PageDataImpl.java b/impl/src/main/java/org/apache/jasper/compiler/PageDataImpl.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -61,7 +61,7 @@
 import java.io.InputStream;
 import java.io.ByteArrayInputStream;
 import java.io.CharArrayWriter;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
 import java.util.ListIterator;
 import javax.servlet.jsp.tagext.PageData;
 import org.xml.sax.Attributes;
@@ -93,6 +93,7 @@ class PageDataImpl extends PageData implements TagConstants {
     private static final String JSP_VERSION = "2.0";
     private static final String CDATA_START_SECTION = "<![CDATA[\n";
     private static final String CDATA_END_SECTION = "]]>\n";
+    private static final Charset CHARSET_UTF8 = Charset.forName("UTF-8");
 
     // string buffer used to build XML view
     private StringBuilder buf;
@@ -127,12 +128,7 @@ public PageDataImpl(Node.Nodes page, Compiler compiler)
      */
     public InputStream getInputStream() {
 	// Turn StringBuilder into InputStream
-        try {
-            return new ByteArrayInputStream(buf.toString().getBytes("UTF-8"));
-        } catch (UnsupportedEncodingException uee) {
-	    // should never happen
-            throw new RuntimeException(uee.toString());
-        }
+        return new ByteArrayInputStream(buf.toString().getBytes(CHARSET_UTF8));
     }
 
     /*
diff --git a/impl/src/main/java/org/apache/jasper/compiler/SmapUtil.java b/impl/src/main/java/org/apache/jasper/compiler/SmapUtil.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -66,6 +66,7 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -160,11 +161,11 @@ public void installSmap() throws IOException {
             byte[] classfile = ctxt.getRuntimeContext().getBytecode(className);
             if (classfile == null) {
                 SDEInstaller.install(new File(ci.getClassFileName()),
-                                     ci.getSmap().getBytes());
+                             ci.getSmap().getBytes(Charset.defaultCharset()));
             }
             else {
                 classfile = SDEInstaller.install(classfile,
-                                                 ci.getSmap().getBytes());
+                             ci.getSmap().getBytes(Charset.defaultCharset()));
                 ctxt.getRuntimeContext().setBytecode(className, classfile);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.`
`3`	`3`	`*`
`4`		`- * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.`
	`4`	`+ * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved.`
`5`	`5`	`*`
`6`	`6`	`* The contents of this file are subject to the terms of either the GNU`
`7`	`7`	`* General Public License Version 2 only ("GPL") or the Common Development`
`@@ -66,6 +66,7 @@`
`66`	`66`	`import java.io.OutputStreamWriter;`
`67`	`67`	`import java.io.PrintWriter;`
`68`	`68`	`import java.io.UnsupportedEncodingException;`
	`69`	`+import java.nio.charset.Charset;`
`69`	`70`	`import java.util.ArrayList;`
`70`	`71`	`import java.util.List;`
`71`	`72`
`@@ -160,11 +161,11 @@ public void installSmap() throws IOException {`
`160`	`161`	`byte[] classfile = ctxt.getRuntimeContext().getBytecode(className);`
`161`	`162`	`if (classfile == null) {`
`162`	`163`	`SDEInstaller.install(new File(ci.getClassFileName()),`
`163`		`- ci.getSmap().getBytes());`
	`164`	`+ ci.getSmap().getBytes(Charset.defaultCharset()));`
`164`	`165`	`}`
`165`	`166`	`else {`
`166`	`167`	`classfile = SDEInstaller.install(classfile,`
`167`		`- ci.getSmap().getBytes());`
	`168`	`+ ci.getSmap().getBytes(Charset.defaultCharset()));`
`168`	`169`	`ctxt.getRuntimeContext().setBytecode(className, classfile);`
`169`	`170`	`}`
`170`	`171`	`}`