Author: markt
Date: Sun Jan 16 16:50:25 2011
New Revision: 1059614
URL: http://svn.apache.org/viewvc?rev=1059614&view=rev
Log:
Fix FindBugs warnings
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/MultipartDef.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java
tomcat/trunk/res/findbugs/filter-false-positives.xml
Modified: tomcat/trunk/java/org/apache/catalina/deploy/MultipartDef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/MultipartDef.java?rev=1059614&r1=1059613&r2=1059614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/MultipartDef.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/MultipartDef.java Sun Jan 16
16:50:25 2011
@@ -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;
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java?rev=1059614&r1=1059613&r2=1059614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java Sun Jan 16
16:50:25 2011
@@ -65,12 +65,12 @@ public class JspServlet extends HttpServ
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;
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java?rev=1059614&r1=1059613&r2=1059614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
Sun Jan 16 16:50:25 2011
@@ -20,6 +20,7 @@ package org.apache.tomcat.util.bcel.clas
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;
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java?rev=1059614&r1=1059613&r2=1059614&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
Sun Jan 16 16:50:25 2011
@@ -20,6 +20,7 @@ package org.apache.tomcat.util.bcel.clas
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.Const
* @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;
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java?rev=1059614&r1=1059613&r2=1059614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java
Sun Jan 16 16:50:25 2011
@@ -20,6 +20,7 @@ package org.apache.tomcat.util.bcel.clas
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.Const
* @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
Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1059614&r1=1059613&r2=1059614&view=diff
==============================================================================
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Sun Jan 16 16:50:25
2011
@@ -23,6 +23,11 @@
<Bug code="Dm" />
</Match>
<Match>
+ <!-- Field is only modified during Servlet load -->
+ <Class name="org.apache.catalina.manager.host.HostManagerServlet" />
+ <Bug code="MSF" />
+ </Match>
+ <Match>
<!-- Sleep is short, needs to keep lock -->
<Class name="org.apache.catalina.startup.HostConfig" />
<Method name="checkResources" />
@@ -71,6 +76,11 @@
<Bug code="Nm" />
</Match>
<Match>
+ <!-- Field by field copy is fine for clone in thos case -->
+ <Class name="org.apache.tomcat.util.bcel.classfile.StackMapType"/>
+ <Bug code="CN" />
+ </Match>
+ <Match>
<!-- Returning null here is fine -->
<Class name="org.apache.tomcat.util.buf.MessageBytes"/>
<Method name="toString"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
