You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2010/10/08 16:16:24 UTC

svn commit: r1005837 - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/javax/servlet/jsp/ java/javax/servlet/jsp/tagext/ webapps/docs/

Author: markt
Date: Fri Oct  8 14:16:23 2010
New Revision: 1005837

URL: http://svn.apache.org/viewvc?rev=1005837&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50017
Code clean-up. No functional change.
Patch provided by sebb

Modified:
    tomcat/trunk/java/javax/el/ValueReference.java
    tomcat/trunk/java/javax/servlet/AsyncEvent.java
    tomcat/trunk/java/javax/servlet/HttpConstraintElement.java
    tomcat/trunk/java/javax/servlet/HttpMethodConstraintElement.java
    tomcat/trunk/java/javax/servlet/MultipartConfigElement.java
    tomcat/trunk/java/javax/servlet/ServletContextAttributeEvent.java
    tomcat/trunk/java/javax/servlet/ServletRequestAttributeEvent.java
    tomcat/trunk/java/javax/servlet/ServletRequestEvent.java
    tomcat/trunk/java/javax/servlet/ServletSecurityElement.java
    tomcat/trunk/java/javax/servlet/UnavailableException.java
    tomcat/trunk/java/javax/servlet/http/HttpSessionBindingEvent.java
    tomcat/trunk/java/javax/servlet/jsp/ErrorData.java
    tomcat/trunk/java/javax/servlet/jsp/tagext/BodyContent.java
    tomcat/trunk/java/javax/servlet/jsp/tagext/FunctionInfo.java
    tomcat/trunk/java/javax/servlet/jsp/tagext/TagAttributeInfo.java
    tomcat/trunk/java/javax/servlet/jsp/tagext/TagData.java
    tomcat/trunk/java/javax/servlet/jsp/tagext/TagExtraInfo.java
    tomcat/trunk/java/javax/servlet/jsp/tagext/TagFileInfo.java
    tomcat/trunk/java/javax/servlet/jsp/tagext/TagVariableInfo.java
    tomcat/trunk/java/javax/servlet/jsp/tagext/ValidationMessage.java
    tomcat/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/javax/el/ValueReference.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ValueReference.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ValueReference.java (original)
+++ tomcat/trunk/java/javax/el/ValueReference.java Fri Oct  8 14:16:23 2010
@@ -26,8 +26,8 @@ public class ValueReference implements S
 
     private static final long serialVersionUID = 1L;
     
-    private Object base;
-    private Object property;
+    private final Object base;
+    private final Object property;
     
     public ValueReference(Object base, Object property) {
         this.base = base;

Modified: tomcat/trunk/java/javax/servlet/AsyncEvent.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/AsyncEvent.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/AsyncEvent.java (original)
+++ tomcat/trunk/java/javax/servlet/AsyncEvent.java Fri Oct  8 14:16:23 2010
@@ -21,13 +21,16 @@ package javax.servlet;
  * @since Servlet 3.0
  */
 public class AsyncEvent {
-    private AsyncContext context;
-    private ServletRequest request;
-    private ServletResponse response;
-    private Throwable throwable;
+    private final AsyncContext context;
+    private final ServletRequest request;
+    private final ServletResponse response;
+    private final Throwable throwable;
     
     public AsyncEvent(AsyncContext context) {
         this.context = context;
+        this.request = null;
+        this.response = null;
+        this.throwable = null;
     }
 
     public AsyncEvent(AsyncContext context, ServletRequest request,
@@ -35,11 +38,14 @@ public class AsyncEvent {
         this.context = context;
         this.request = request;
         this.response = response;
+        this.throwable = null;
     }
     
     public AsyncEvent(AsyncContext context, Throwable throwable) {
         this.context = context;
         this.throwable = throwable;
+        this.request = null;
+        this.response = null;
     }
 
     public AsyncEvent(AsyncContext context, ServletRequest request,

Modified: tomcat/trunk/java/javax/servlet/HttpConstraintElement.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/HttpConstraintElement.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/HttpConstraintElement.java (original)
+++ tomcat/trunk/java/javax/servlet/HttpConstraintElement.java Fri Oct  8 14:16:23 2010
@@ -31,15 +31,18 @@ public class HttpConstraintElement {
     private static final ResourceBundle lStrings =
         ResourceBundle.getBundle(LSTRING_FILE);
 
-    private EmptyRoleSemantic emptyRoleSemantic = EmptyRoleSemantic.PERMIT;
-    private TransportGuarantee transportGuarantee = TransportGuarantee.NONE;
-    private String[] rolesAllowed = new String[0];
+    private final EmptyRoleSemantic emptyRoleSemantic;// = EmptyRoleSemantic.PERMIT;
+    private final TransportGuarantee transportGuarantee;// = TransportGuarantee.NONE;
+    private final String[] rolesAllowed;// = new String[0];
     
     /**
      * Default constraint is permit with no transport guarantee.
      */
     public HttpConstraintElement() {
         // Default constructor
+        this.emptyRoleSemantic = EmptyRoleSemantic.PERMIT;
+        this.transportGuarantee = TransportGuarantee.NONE;
+        this.rolesAllowed = new String[0];
     }
     
     /**
@@ -48,6 +51,8 @@ public class HttpConstraintElement {
      */
     public HttpConstraintElement(EmptyRoleSemantic emptyRoleSemantic) {
         this.emptyRoleSemantic = emptyRoleSemantic;
+        this.transportGuarantee = TransportGuarantee.NONE;
+        this.rolesAllowed = new String[0];
     }
     
     /**
@@ -55,6 +60,7 @@ public class HttpConstraintElement {
      */
     public HttpConstraintElement(TransportGuarantee transportGuarantee,
             String... rolesAllowed) {
+        this.emptyRoleSemantic = EmptyRoleSemantic.PERMIT;
         this.transportGuarantee = transportGuarantee;
         this.rolesAllowed = rolesAllowed;
     }

Modified: tomcat/trunk/java/javax/servlet/HttpMethodConstraintElement.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/HttpMethodConstraintElement.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/HttpMethodConstraintElement.java (original)
+++ tomcat/trunk/java/javax/servlet/HttpMethodConstraintElement.java Fri Oct  8 14:16:23 2010
@@ -29,7 +29,7 @@ public class HttpMethodConstraintElement
     private static final ResourceBundle lStrings =
         ResourceBundle.getBundle(LSTRING_FILE);
 
-    private String methodName;
+    private final String methodName;
 
     public HttpMethodConstraintElement(String methodName) {
         if (methodName == null || methodName.length() == 0) {

Modified: tomcat/trunk/java/javax/servlet/MultipartConfigElement.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/MultipartConfigElement.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/MultipartConfigElement.java (original)
+++ tomcat/trunk/java/javax/servlet/MultipartConfigElement.java Fri Oct  8 14:16:23 2010
@@ -24,16 +24,21 @@ import javax.servlet.annotation.Multipar
  */
 public class MultipartConfigElement {
     
-    private String location = "";
-    private long maxFileSize = -1;
-    private long maxRequestSize = -1;
-    private int fileSizeThreshold = 0;
+    private final String location;// = "";
+    private final long maxFileSize;// = -1;
+    private final long maxRequestSize;// = -1;
+    private final int fileSizeThreshold;// = 0;
     
     public MultipartConfigElement(String location) {
         // Keep empty string default if location is null
         if (location != null) {
             this.location = location;
+        } else {
+            this.location = "";
         }
+        this.maxFileSize = -1;
+        this.maxRequestSize = -1;
+        this.fileSizeThreshold = 0;
     }
     
     public MultipartConfigElement(String location, long maxFileSize,
@@ -41,6 +46,8 @@ public class MultipartConfigElement {
         // Keep empty string default if location is null
         if (location != null) {
             this.location = location;
+        } else {
+            this.location = "";
         }
         this.maxFileSize = maxFileSize;
         this.maxRequestSize = maxRequestSize;

Modified: tomcat/trunk/java/javax/servlet/ServletContextAttributeEvent.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContextAttributeEvent.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletContextAttributeEvent.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContextAttributeEvent.java Fri Oct  8 14:16:23 2010
@@ -24,8 +24,8 @@ package javax.servlet;
  * @since v 2.3
  */
 public class ServletContextAttributeEvent extends ServletContextEvent {
-    private String name;
-    private Object value;
+    private final String name;
+    private final Object value;
 
     /**
      * Construct a ServletContextAttributeEvent from the given context for the

Modified: tomcat/trunk/java/javax/servlet/ServletRequestAttributeEvent.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRequestAttributeEvent.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletRequestAttributeEvent.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequestAttributeEvent.java Fri Oct  8 14:16:23 2010
@@ -24,8 +24,8 @@ package javax.servlet;
  * @since Servlet 2.4
  */
 public class ServletRequestAttributeEvent extends ServletRequestEvent {
-    private String name;
-    private Object value;
+    private final String name;
+    private final Object value;
 
     /**
      * Construct a ServletRequestAttributeEvent giving the servlet context of

Modified: tomcat/trunk/java/javax/servlet/ServletRequestEvent.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRequestEvent.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletRequestEvent.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequestEvent.java Fri Oct  8 14:16:23 2010
@@ -24,7 +24,7 @@ package javax.servlet;
  * @since Servlet 2.4
  */
 public class ServletRequestEvent extends java.util.EventObject {
-    private ServletRequest request;
+    private final ServletRequest request;
 
     /**
      * Construct a ServletRequestEvent for the given ServletContext and

Modified: tomcat/trunk/java/javax/servlet/ServletSecurityElement.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletSecurityElement.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletSecurityElement.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletSecurityElement.java Fri Oct  8 14:16:23 2010
@@ -32,7 +32,7 @@ import javax.servlet.annotation.ServletS
  */
 public class ServletSecurityElement extends HttpConstraintElement {
     
-    private Map<String,HttpMethodConstraintElement> methodConstraints =
+    private final Map<String,HttpMethodConstraintElement> methodConstraints =
         new HashMap<String,HttpMethodConstraintElement>();
 
     /**

Modified: tomcat/trunk/java/javax/servlet/UnavailableException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/UnavailableException.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/UnavailableException.java (original)
+++ tomcat/trunk/java/javax/servlet/UnavailableException.java Fri Oct  8 14:16:23 2010
@@ -44,9 +44,9 @@ package javax.servlet;
  */
 public class UnavailableException extends ServletException {
 
-    private Servlet servlet; // what's unavailable
-    private boolean permanent; // needs admin action?
-    private int seconds; // unavailability estimate
+    private final Servlet servlet; // what's unavailable
+    private final boolean permanent; // needs admin action?
+    private final int seconds; // unavailability estimate
 
     /**
      * @param servlet
@@ -62,6 +62,7 @@ public class UnavailableException extend
         super(msg);
         this.servlet = servlet;
         permanent = true;
+        this.seconds = 0;
     }
 
     /**
@@ -98,7 +99,8 @@ public class UnavailableException extend
      */
     public UnavailableException(String msg) {
         super(msg);
-
+        seconds = 0;
+        servlet = null;
         permanent = true;
     }
 
@@ -128,7 +130,7 @@ public class UnavailableException extend
             this.seconds = -1;
         else
             this.seconds = seconds;
-
+        servlet = null;
         permanent = false;
     }
 

Modified: tomcat/trunk/java/javax/servlet/http/HttpSessionBindingEvent.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpSessionBindingEvent.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpSessionBindingEvent.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpSessionBindingEvent.java Fri Oct  8 14:16:23 2010
@@ -38,11 +38,11 @@ public class HttpSessionBindingEvent ext
 
     /* The name to which the object is being bound or unbound */
 
-    private String name;
+    private final String name;
 
     /* The object is being bound or unbound */
 
-    private Object value;
+    private final Object value;
 
     /**
      * Constructs an event that notifies an object that it has been bound to or
@@ -59,6 +59,7 @@ public class HttpSessionBindingEvent ext
     public HttpSessionBindingEvent(HttpSession session, String name) {
         super(session);
         this.name = name;
+        this.value = null;
     }
 
     /**

Modified: tomcat/trunk/java/javax/servlet/jsp/ErrorData.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/ErrorData.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/ErrorData.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/ErrorData.java Fri Oct  8 14:16:23 2010
@@ -27,10 +27,10 @@ package javax.servlet.jsp;
  */
 public final class ErrorData {
 
-    private Throwable throwable;
-    private int statusCode;
-    private String uri;
-    private String servletName;
+    private final Throwable throwable;
+    private final int statusCode;
+    private final String uri;
+    private final String servletName;
 
     /**
      * Creates a new ErrorData object.

Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/BodyContent.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/BodyContent.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/BodyContent.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/BodyContent.java Fri Oct  8 14:16:23 2010
@@ -121,5 +121,5 @@ public abstract class BodyContent extend
 
     // private fields
 
-    private JspWriter enclosingWriter;
+    private final JspWriter enclosingWriter;
 }

Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/FunctionInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/FunctionInfo.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/FunctionInfo.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/FunctionInfo.java Fri Oct  8 14:16:23 2010
@@ -73,7 +73,7 @@ public class FunctionInfo {
     /*
      * fields
      */
-    private String name;
-    private String functionClass;
-    private String functionSignature;
+    private final String name;
+    private final String functionClass;
+    private final String functionSignature;
 }

Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagAttributeInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagAttributeInfo.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagAttributeInfo.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagAttributeInfo.java Fri Oct  8 14:16:23 2010
@@ -51,10 +51,7 @@ public class TagAttributeInfo {
 
     public TagAttributeInfo(String name, boolean required, String type,
             boolean reqTime) {
-        this.name = name;
-        this.required = required;
-        this.type = type;
-        this.reqTime = reqTime;
+        this(name, required, type, reqTime, false);
     }
 
     /**
@@ -78,8 +75,7 @@ public class TagAttributeInfo {
 
     public TagAttributeInfo(String name, boolean required, String type,
             boolean reqTime, boolean fragment) {
-        this(name, required, type, reqTime);
-        this.fragment = fragment;
+        this(name, required, type, reqTime, fragment, null, false, false, null, null);
     }
 
     /**
@@ -89,7 +85,11 @@ public class TagAttributeInfo {
             boolean reqTime, boolean fragment, String description,
             boolean deferredValue, boolean deferredMethod,
             String expectedTypeName, String methodSignature) {
-        this(name, required, type, reqTime, fragment);
+        this.name = name;
+        this.required = required;
+        this.type = type;
+        this.reqTime = reqTime;
+        this.fragment = fragment;
         this.description = description;
         this.deferredValue = deferredValue;
         this.deferredMethod = deferredMethod;
@@ -188,31 +188,31 @@ public class TagAttributeInfo {
     /*
      * private fields
      */
-    private String name;
+    private final String name;
 
-    private String type;
+    private final String type;
 
-    private boolean reqTime;
+    private final boolean reqTime;
 
-    private boolean required;
+    private final boolean required;
 
     /*
      * private fields for JSP 2.0
      */
-    private boolean fragment;
+    private final boolean fragment;
 
     /*
      * private fields for JSP 2.1
      */
-    private String description;
+    private final String description;
 
-    private boolean deferredValue;
+    private final boolean deferredValue;
 
-    private boolean deferredMethod;
+    private final boolean deferredMethod;
 
-    private String expectedTypeName;
+    private final String expectedTypeName;
 
-    private String methodSignature;
+    private final String methodSignature;
 
     public boolean isDeferredMethod() {
         return deferredMethod;

Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagData.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagData.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagData.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagData.java Fri Oct  8 14:16:23 2010
@@ -149,5 +149,5 @@ public class TagData implements Cloneabl
 
     // private data
 
-    private Hashtable<String, Object> attributes;        // the tagname/value map
+    private final Hashtable<String, Object> attributes;        // the tagname/value map
 }

Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagExtraInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagExtraInfo.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagExtraInfo.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagExtraInfo.java Fri Oct  8 14:16:23 2010
@@ -137,7 +137,7 @@ public abstract class TagExtraInfo {
     }
     
     // private data
-    private TagInfo tagInfo;
+    private  TagInfo tagInfo;
 
     // zero length VariableInfo array
     private static final VariableInfo[] ZERO_VARIABLE_INFO = { };

Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagFileInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagFileInfo.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagFileInfo.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagFileInfo.java Fri Oct  8 14:16:23 2010
@@ -80,7 +80,7 @@ public class TagFileInfo {
     }
 
     // private fields for 2.0 info
-    private String name;
-    private String path;
-    private TagInfo tagInfo;
+    private final String name;
+    private final String path;
+    private final TagInfo tagInfo;
 }

Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagVariableInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagVariableInfo.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagVariableInfo.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagVariableInfo.java Fri Oct  8 14:16:23 2010
@@ -101,9 +101,9 @@ public class TagVariableInfo {
     /*
      * private fields
      */
-    private String nameGiven; // <name-given>
-    private String nameFromAttribute; // <name-from-attribute>
-    private String className; // <class>
-    private boolean declare; // <declare>
-    private int scope; // <scope>
+    private final String nameGiven; // <name-given>
+    private final String nameFromAttribute; // <name-from-attribute>
+    private final String className; // <class>
+    private final boolean declare; // <declare>
+    private final int scope; // <scope>
 }

Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/ValidationMessage.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/ValidationMessage.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/ValidationMessage.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/ValidationMessage.java Fri Oct  8 14:16:23 2010
@@ -72,6 +72,6 @@ public class ValidationMessage {
     }
 
     // Private data
-    private String id;
-    private String message;
+    private final String id;
+    private final String message;
 }

Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java Fri Oct  8 14:16:23 2010
@@ -250,8 +250,8 @@ public class VariableInfo {
     }
 
     // == private data
-    private String varName;
-    private String className;
-    private boolean declare;
-    private int scope;
+    private final String varName;
+    private final String className;
+    private final boolean declare;
+    private final int scope;
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1005837&r1=1005836&r2=1005837&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Oct  8 14:16:23 2010
@@ -99,6 +99,10 @@
         <code>login()/logout()</code> methods to support JACC implementations
         and to improve encapsulation. Patch provided by David Jencks. (markt)
       </fix>
+      <update>
+        <bug>50017</bug>: Code clean-up. No functional change. Patch provided by
+        sebb. (markt)
+      </update>
     </changelog>
   </subsection>
   <subsection name="Coyote">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org