Author: markt
Date: Tue Mar 15 13:56:35 2011
New Revision: 1081785
URL: http://svn.apache.org/viewvc?rev=1081785&view=rev
Log:
More FindBugs warnings
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/trunk/res/findbugs/filter-false-positives.xml
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java?rev=1081785&r1=1081784&r2=1081785&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java Tue Mar 15
13:56:35 2011
@@ -1652,7 +1652,7 @@ public class MBeanUtils {
c = c.getParent();
}
- if (c instanceof Engine) {
+ if (c != null) {
domain = c.getName();
}
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?rev=1081785&r1=1081784&r2=1081785&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java Tue Mar
15 13:56:35 2011
@@ -428,7 +428,8 @@ class TagFileProcessor {
HashMap<String, NameEntry> table = (type == VAR_NAME_FROM) ?
nameFromTable : nameTable;
NameEntry nameEntry = table.get(name);
if (nameEntry != null) {
- if (type != TAG_DYNAMIC || nameEntry.getType() != TAG_DYNAMIC)
{
+ if (!TAG_DYNAMIC.equals(type) ||
+ !TAG_DYNAMIC.equals(nameEntry.getType())) {
int line = nameEntry.getNode().getStart().getLineNumber();
err.jspError(n, "jsp.error.tagfile.nameNotUnique", type,
nameEntry.getType(), Integer.toString(line));
Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1081785&r1=1081784&r2=1081785&view=diff
==============================================================================
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Tue Mar 15 13:56:35
2011
@@ -151,11 +151,16 @@
<Bug code="Nm" />
</Match>
<Match>
- <!-- Field by field copy is fine for clone in thos case -->
+ <!-- Field by field copy is fine for clone in this case -->
<Class name="org.apache.tomcat.util.bcel.classfile.StackMapType"/>
<Bug code="CN" />
</Match>
<Match>
+ <!-- Fall-through expected -->
+ <Class name="org.apache.tomcat.util.bcel.classfile.Utility"/>
+ <Bug code="SF" />
+ </Match>
+ <Match>
<!-- Returning null here is fine -->
<Class name="org.apache.tomcat.util.buf.MessageBytes"/>
<Method name="toString"/>
@@ -170,7 +175,10 @@
<Match>
<!-- Test really is for the same object rather than equality -->
<Class name="org.apache.tomcat.util.digester.Digester"/>
- <Method name="updateBodyText"/>
+ <Or>
+ <Method name="updateBodyText"/>
+ <Method name="updateAttributes"/>
+ </Or>
<Bug code="ES" />
</Match>
<Match>
@@ -192,6 +200,11 @@
<Bug code="ML" />
</Match>
<Match>
+ <Class name="org.apache.tomcat.util.net.SecureNioChannel"/>
+ <Method name="rehandshake"/>
+ <Bug code="DE" />
+ </Match>
+ <Match>
<!-- Sync is there to protect referenced object not field -->
<Class
name="org.apache.tomcat.util.net.AprEndpoint$SocketWithOptionsProcessor"/>
<Method name="run"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
