From f60826962619e488c2dadbdc54410f1560d0a1af Mon Sep 17 00:00:00 2001 From: markt Date: Sun, 16 Jan 2011 16:50:25 +0000 Subject: [PATCH] Fix FindBugs warnings git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1059614 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/deploy/MultipartDef.java | 6 +++++- java/org/apache/jasper/servlet/JspServlet.java | 8 ++++---- java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java | 5 ++++- .../apache/tomcat/util/bcel/classfile/StackMapTableEntry.java | 5 ++++- java/org/apache/tomcat/util/bcel/classfile/StackMapType.java | 5 ++++- res/findbugs/filter-false-positives.xml | 10 ++++++++++ 6 files changed, 31 insertions(+), 8 deletions(-) diff --git a/java/org/apache/catalina/deploy/MultipartDef.java b/java/org/apache/catalina/deploy/MultipartDef.java index d987f8f1a..c3ed7949e 100644 --- a/java/org/apache/catalina/deploy/MultipartDef.java +++ b/java/org/apache/catalina/deploy/MultipartDef.java @@ -18,11 +18,15 @@ package org.apache.catalina.deploy; +import java.io.Serializable; + /** * Representation of a the multipart configuration for a servlet. */ -public class MultipartDef { +public class MultipartDef implements Serializable { + + private static final long serialVersionUID = 1L; // ------------------------------------------------------------- Properties private String location; diff --git a/java/org/apache/jasper/servlet/JspServlet.java b/java/org/apache/jasper/servlet/JspServlet.java index 00e00768f..db0d51f73 100644 --- a/java/org/apache/jasper/servlet/JspServlet.java +++ b/java/org/apache/jasper/servlet/JspServlet.java @@ -65,12 +65,12 @@ public class JspServlet extends HttpServlet implements PeriodicEventListener { private static final long serialVersionUID = 1L; // Logger - private final Log log = LogFactory.getLog(JspServlet.class); + private final transient Log log = LogFactory.getLog(JspServlet.class); - private ServletContext context; + private transient ServletContext context; private ServletConfig config; - private Options options; - private JspRuntimeContext rctxt; + private transient Options options; + private transient JspRuntimeContext rctxt; //jspFile for a jsp configured explicitly as a servlet, in environments where this configuration is //translated into an init-param for this servlet. private String jspFile; diff --git a/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java b/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java index 13b97b4e5..fcdf12035 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java +++ b/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java @@ -20,6 +20,7 @@ package org.apache.tomcat.util.bcel.classfile; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import java.io.Serializable; /** * This class represents a stack map entry recording the types of @@ -31,7 +32,9 @@ import java.io.IOException; * @see StackMap * @see StackMapType */ -public final class StackMapEntry implements Cloneable { +public final class StackMapEntry implements Cloneable, Serializable { + + private static final long serialVersionUID = 1L; private int byte_code_offset; private int number_of_locals; diff --git a/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java b/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java index d9f2e98a9..314afd353 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java +++ b/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java @@ -20,6 +20,7 @@ package org.apache.tomcat.util.bcel.classfile; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import java.io.Serializable; import org.apache.tomcat.util.bcel.Constants; @@ -33,7 +34,9 @@ import org.apache.tomcat.util.bcel.Constants; * @see StackMap * @see StackMapType */ -public final class StackMapTableEntry implements Cloneable { +public final class StackMapTableEntry implements Cloneable, Serializable { + + private static final long serialVersionUID = 1L; private int frame_type; private int byte_code_offset_delta; diff --git a/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java b/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java index 5b94d7d72..93d90094d 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java +++ b/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java @@ -20,6 +20,7 @@ package org.apache.tomcat.util.bcel.classfile; import java.io.DataInput; import java.io.DataOutputStream; import java.io.IOException; +import java.io.Serializable; import org.apache.tomcat.util.bcel.Constants; @@ -33,7 +34,9 @@ import org.apache.tomcat.util.bcel.Constants; * @see StackMap * @see Constants */ -public final class StackMapType implements Cloneable { +public final class StackMapType implements Cloneable, Serializable { + + private static final long serialVersionUID = 1L; private byte type; private int index = -1; // Index to CONSTANT_Class or offset diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml index 27d436837..5476ec0ac 100644 --- a/res/findbugs/filter-false-positives.xml +++ b/res/findbugs/filter-false-positives.xml @@ -23,6 +23,11 @@ + + + + + @@ -71,6 +76,11 @@ + + + + + -- 2.11.0