From 2752924b05edabe87e07f8b28d508da323a88c7a Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 2 Feb 2010 17:52:17 +0000
Subject: [PATCH] Fix Eclipse warnings

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@905732 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/catalina/servlets/DefaultServlet.java | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java
index f75530ffe..715b9078c 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -79,7 +79,9 @@ import org.apache.naming.resources.ResourceAttributes;
 
 public class DefaultServlet
     extends HttpServlet {
-    
+
+    private static final long serialVersionUID = 1L;
+
     // ----------------------------------------------------- Instance Variables
 
 
@@ -671,10 +673,12 @@ public class DefaultServlet
                                  boolean content)
         throws IOException, ServletException {
 
+        boolean serveContent = content;
+        
         // Identify the requested resource path
         String path = getRelativePath(request);
         if (debug > 0) {
-            if (content)
+            if (serveContent)
                 log("DefaultServlet.serveResource:  Serving resource '" +
                     path + "' headers and data");
             else
@@ -779,7 +783,7 @@ public class DefaultServlet
             // Special case for zero length files, which would cause a
             // (silent) ISE when setting the output buffer size
             if (contentLength == 0L) {
-                content = false;
+                serveContent = false;
             }
 
         }
@@ -787,7 +791,7 @@ public class DefaultServlet
         ServletOutputStream ostream = null;
         PrintWriter writer = null;
 
-        if (content) {
+        if (serveContent) {
 
             // Trying to retrieve the servlet output stream
 
@@ -834,7 +838,7 @@ public class DefaultServlet
             InputStream renderResult = null;
             if (cacheEntry.context != null) {
 
-                if (content) {
+                if (serveContent) {
                     // Serve the directory browser
                     renderResult =
                         render(request.getContextPath(), cacheEntry);
@@ -843,7 +847,7 @@ public class DefaultServlet
             }
 
             // Copy the input stream to our output stream (if requested)
-            if (content) {
+            if (serveContent) {
                 try {
                     response.setBufferSize(output);
                 } catch (IllegalStateException e) {
@@ -888,7 +892,7 @@ public class DefaultServlet
                     response.setContentType(contentType);
                 }
 
-                if (content) {
+                if (serveContent) {
                     try {
                         response.setBufferSize(output);
                     } catch (IllegalStateException e) {
@@ -907,7 +911,7 @@ public class DefaultServlet
                 response.setContentType("multipart/byteranges; boundary="
                                         + mimeSeparation);
 
-                if (content) {
+                if (serveContent) {
                     try {
                         response.setBufferSize(output);
                     } catch (IllegalStateException e) {
-- 
2.11.0