Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-3615 - Dead code in PlainTextResult

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1097343 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Maurizio Cucchiara
2011-04-28 07:51:45 +00:00
parent 3650863e0d
commit eaa0a9ca6d
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java
+16 -18
View File
@@ -21,17 +21,17 @@
package org.apache.struts2.dispatcher;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.nio.charset.Charset;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletResponse;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.nio.charset.Charset;
/**
* <!-- START SNIPPET: description -->
*
@@ -141,24 +141,22 @@ public class PlainTextResult extends StrutsResultSupport {
PrintWriter writer = response.getWriter();
InputStreamReader reader = null;
try {
InputStream resourceAsStream = servletContext.getResourceAsStream(finalLocation);
if (charset != null) {
reader = new InputStreamReader(servletContext.getResourceAsStream(finalLocation), charset);
reader = new InputStreamReader(resourceAsStream, charset);
} else {
reader = new InputStreamReader(resourceAsStream);
}
else {
reader = new InputStreamReader(servletContext.getResourceAsStream(finalLocation));
}
if (reader == null) {
LOG.warn("resource at location ["+finalLocation+"] cannot be obtained (return null) from ServletContext !!! ");
}
else {
if (resourceAsStream == null) {
LOG.warn("resource at location ["+finalLocation+"] cannot be obtained (return null) from ServletContext !!! ");
} else {
char[] buffer = new char[BUFFER_SIZE];
int charRead = 0;
int charRead;
while((charRead = reader.read(buffer)) != -1) {
writer.write(buffer, 0, charRead);
}
}
}
finally {
} finally {
if (reader != null)
reader.close();
if (writer != null) {