This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

View the commit online:
https://github.com/apache/tomcat/commit/5274de17b81c7e1a9e8e3ccb2bc89f71416d26ce

commit 5274de17b81c7e1a9e8e3ccb2bc89f71416d26ce
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Nov 20 13:24:15 2019 +0000

    Alphabetical order
---
 res/findbugs/filter-false-positives.xml | 46 ++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/res/findbugs/filter-false-positives.xml 
b/res/findbugs/filter-false-positives.xml
index 2c8d18b..cefc6fe 100644
--- a/res/findbugs/filter-false-positives.xml
+++ b/res/findbugs/filter-false-positives.xml
@@ -1695,23 +1695,6 @@
     <Bug pattern="MSF_MUTABLE_SERVLET_FIELD"/>
   </Match>
   <Match>
-    <!-- Deliberate hack for the purposes of the test -->
-    <Class name="org.apache.catalina.startup.TesterServletWithAnnotations"/>
-    <Or>
-      <Field name="envEntry2"/>
-      <Field name="envEntry3"/>
-      <Field name="envEntry4"/>
-      <Field name="envEntry6"/>
-    </Or>
-    <Bug pattern="MSF_MUTABLE_SERVLET_FIELD"/>
-  </Match>
-  <Match>
-    <!-- Deliberate hack for the purposes of the test -->
-    <Class 
name="org.apache.catalina.startup.TesterServletWithLifeCycleMethods"/>
-    <Field name="result"/>
-    <Bug pattern="MSF_MUTABLE_SERVLET_FIELD"/>
-  </Match>
-  <Match>
     <!-- Return value of latch is intentionally ignored -->
     <Class name="org.apache.catalina.nonblocking.TestNonBlockingAPI"/>
     <Method name="testDelayedNBWrite"/>
@@ -1730,6 +1713,23 @@
     <Bug pattern="RR_NOT_CHECKED"/>
   </Match>
   <Match>
+    <!-- Deliberate hack for the purposes of the test -->
+    <Class name="org.apache.catalina.startup.TesterServletWithAnnotations"/>
+    <Or>
+      <Field name="envEntry2"/>
+      <Field name="envEntry3"/>
+      <Field name="envEntry4"/>
+      <Field name="envEntry6"/>
+    </Or>
+    <Bug pattern="MSF_MUTABLE_SERVLET_FIELD"/>
+  </Match>
+  <Match>
+    <!-- Deliberate hack for the purposes of the test -->
+    <Class 
name="org.apache.catalina.startup.TesterServletWithLifeCycleMethods"/>
+    <Field name="result"/>
+    <Bug pattern="MSF_MUTABLE_SERVLET_FIELD"/>
+  </Match>
+  <Match>
     <Or>
       <Class name="org.apache.catalina.startup.TestListener$SCL" />
       <Class name="org.apache.catalina.startup.TestListener$SCL3" />
@@ -1843,18 +1843,18 @@
     <Bug code="DE" />
   </Match>
   <Match>
-    <!-- Deliberate hack for the purposes of the test -->
-    <Class 
name="org.apache.catalina.valves.TestStuckThreadDetectionValve$StickingServlet"/>
-    <Field name="wasInterrupted"/>
-    <Bug pattern="MSF_MUTABLE_SERVLET_FIELD"/>
-  </Match>
-  <Match>
     <!-- Concrete Map type not affected -->
     <Class name="org.apache.catalina.util.TestParameterMap" />
     <Method name="testEntrySetImmutabilityAfterLocked" />
     <Bug pattern="DMI_ENTRY_SETS_MAY_REUSE_ENTRY_OBJECTS" />
   </Match>
   <Match>
+    <!-- Deliberate hack for the purposes of the test -->
+    <Class 
name="org.apache.catalina.valves.TestStuckThreadDetectionValve$StickingServlet"/>
+    <Field name="wasInterrupted"/>
+    <Bug pattern="MSF_MUTABLE_SERVLET_FIELD"/>
+  </Match>
+  <Match>
     <!-- Code is deliberately unused -->
     <Or>
       <Class 
name="org.apache.catalina.webresources.AbstractTestFileResourceSet" />


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to