From 6d6d6903def090dcac9bc46249431e906247b691 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 10 Jan 2011 15:46:18 +0000
Subject: [PATCH] Fix FindBugs warnings in StandardHost

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1057246 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/core/StandardHost.java | 17 ++++++++---------
 res/findbugs/filter-false-positives.xml         |  5 +++++
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/core/StandardHost.java b/java/org/apache/catalina/core/StandardHost.java
index fc442e83d..bda600822 100644
--- a/java/org/apache/catalina/core/StandardHost.java
+++ b/java/org/apache/catalina/core/StandardHost.java
@@ -711,28 +711,27 @@ public class StandardHost extends ContainerBase implements Host {
     protected synchronized void startInternal() throws LifecycleException {
         
         // Set error report valve
-        if ((errorReportValveClass != null)
-            && (!errorReportValveClass.equals(""))) {
+        String errorValve = getErrorReportValveClass();
+        if ((errorValve != null) && (!errorValve.equals(""))) {
             try {
                 boolean found = false;
                 Valve[] valves = getPipeline().getValves();
                 for (Valve valve : valves) {
-                    if (errorReportValveClass.equals(
-                            valve.getClass().getName())) {
+                    if (errorValve.equals(valve.getClass().getName())) {
                         found = true;
                         break;
                     }
                 }
                 if(!found) {
-                    Valve valve = (Valve) Class.forName(errorReportValveClass).
-                            newInstance();
+                    Valve valve =
+                        (Valve) Class.forName(errorValve).newInstance();
                     getPipeline().addValve(valve);
                 }
             } catch (Throwable t) {
                 ExceptionUtils.handleThrowable(t);
-                log.error(sm.getString
-                    ("standardHost.invalidErrorReportValveClass", 
-                     errorReportValveClass), t);
+                log.error(sm.getString(
+                        "standardHost.invalidErrorReportValveClass",
+                        errorValve), t);
             }
         }
         super.startInternal();
diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml
index 141f5a1e3..e8dee4cf1 100644
--- a/res/findbugs/filter-false-positives.xml
+++ b/res/findbugs/filter-false-positives.xml
@@ -1,6 +1,11 @@
 <FindBugsFilter>
   <!--  Considered to be false positives -->
   <Match>
+    <Class name="org.apache.catalina.core.StandardHost" />
+    <Method name="findReloadedContextMemoryLeaks" />
+    <Bug code="Dm" />
+  </Match>
+  <Match>
     <Class name="org.apache.catalina.startup.HostConfig" />
     <Method name="checkResources" />
     <Bug code="SWL" />
-- 
2.11.0