From eaa0a9ca6df52ca2649c740e9bc777bd6a2bfef7 Mon Sep 17 00:00:00 2001
From: Maurizio Cucchiara <mcucchiara@apache.org>
Date: Thu, 28 Apr 2011 07:51:45 +0000
Subject: [PATCH] WW-3615 - Dead code in PlainTextResult

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1097343 13f79535-47bb-0310-9956-ffa450edef68
---
 .../struts2/dispatcher/PlainTextResult.java   | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java b/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java
index fc07a4ec0..406e74cce 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java
@@ -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) {