JBossWeb SVN: r2142 - in branches/7.2.x: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2013-01-02 12:12:49 -0500 (Wed, 02 Jan 2013)
New Revision: 2142
Modified:
branches/7.2.x/src/main/java/org/apache/jasper/runtime/JspWriterImpl.java
branches/7.2.x/webapps/docs/changelog.xml
Log:
Revert Jasper "fix".
Modified: branches/7.2.x/src/main/java/org/apache/jasper/runtime/JspWriterImpl.java
===================================================================
--- branches/7.2.x/src/main/java/org/apache/jasper/runtime/JspWriterImpl.java 2012-12-21 13:35:16 UTC (rev 2141)
+++ branches/7.2.x/src/main/java/org/apache/jasper/runtime/JspWriterImpl.java 2013-01-02 17:12:49 UTC (rev 2142)
@@ -21,14 +21,11 @@
import java.io.IOException;
import java.io.Writer;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
import javax.servlet.ServletResponse;
import javax.servlet.jsp.JspWriter;
import org.apache.jasper.Constants;
-import org.apache.jasper.security.SecurityUtil;
/**
* Write text to a character-output stream, buffering characters so as
@@ -315,21 +312,7 @@
}
}
- /**
- * Write a string. This method cannot be inherited from the Writer class
- * because it must suppress I/O exceptions.
- */
- public void write(String s) throws IOException {
- // Simple fix for Bugzilla 35410
- // Calling the other write function so as to init the buffer anyways
- if(s == null) {
- write(s, 0, 0);
- } else {
- write(s, 0, s.length());
- }
- }
-
static String lineSeparator = System.getProperty("line.separator");
/**
Modified: branches/7.2.x/webapps/docs/changelog.xml
===================================================================
--- branches/7.2.x/webapps/docs/changelog.xml 2012-12-21 13:35:16 UTC (rev 2141)
+++ branches/7.2.x/webapps/docs/changelog.xml 2013-01-02 17:12:49 UTC (rev 2142)
@@ -16,6 +16,16 @@
<body>
+<section name="JBoss Web 7.2.0.Beta2 (remm)">
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>35410</bug>: Revert bugfix working around a null toString(). (markt)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
<section name="JBoss Web 7.2.0.Beta1 (remm)">
<subsection name="Catalina">
<changelog>
11 years, 11 months
- 1
- 0