From 873a42dd8033e2d7d07537afea39d4d13f9c17d6 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 15 Mar 2011 13:56:35 +0000
Subject: [PATCH] More FindBugs warnings

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1081785 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/mbeans/MBeanUtils.java       |  2 +-
 java/org/apache/jasper/compiler/TagFileProcessor.java |  3 ++-
 res/findbugs/filter-false-positives.xml               | 17 +++++++++++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/mbeans/MBeanUtils.java b/java/org/apache/catalina/mbeans/MBeanUtils.java
index 85f271bc6..aa0f7aa72 100644
--- a/java/org/apache/catalina/mbeans/MBeanUtils.java
+++ b/java/org/apache/catalina/mbeans/MBeanUtils.java
@@ -1652,7 +1652,7 @@ public class MBeanUtils {
             c = c.getParent();
         }
         
-        if (c instanceof Engine) {
+        if (c != null) {
             domain = c.getName();
         }
         
diff --git a/java/org/apache/jasper/compiler/TagFileProcessor.java b/java/org/apache/jasper/compiler/TagFileProcessor.java
index 9da39788c..bc459b0a7 100644
--- a/java/org/apache/jasper/compiler/TagFileProcessor.java
+++ b/java/org/apache/jasper/compiler/TagFileProcessor.java
@@ -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));
diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml
index 649137ce2..d931d7f0f 100644
--- a/res/findbugs/filter-false-positives.xml
+++ b/res/findbugs/filter-false-positives.xml
@@ -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"/>
-- 
2.11.0