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

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


The following commit(s) were added to refs/heads/main by this push:
     new b8bbf30  Update false positives to clear remaining issues when running 
plugin
b8bbf30 is described below

commit b8bbf309f98a1a86703a55f161549013a94a7d6b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sun Jan 2 13:33:06 2022 +0000

    Update false positives to clear remaining issues when running plugin
---
 res/spotbugs/filter-false-positives.xml | 61 +++++++++++++++++++++++++--------
 1 file changed, 47 insertions(+), 14 deletions(-)

diff --git a/res/spotbugs/filter-false-positives.xml 
b/res/spotbugs/filter-false-positives.xml
index 589e42c..f924615 100644
--- a/res/spotbugs/filter-false-positives.xml
+++ b/res/spotbugs/filter-false-positives.xml
@@ -1248,6 +1248,12 @@
     <Bug pattern="NM_SAME_SIMPLE_NAME_AS_INTERFACE" />
   </Match>
   <Match>
+    <!-- NPE is triggered by concurrent close. Catching NPE is reasonable. -->
+    <Class name="org.apache.tomcat.jdbc.pool.DisposableConnectionFacade" />
+    <Method name="invoke" />
+    <Bug pattern="DCN_NULLPOINTER_EXCEPTION" />
+  </Match>
+  <Match>
     <!-- Lock is released -->
     <Class name="org.apache.tomcat.jdbc.pool.FairBlockingQueue" />
     <Method name="poll" />
@@ -1813,6 +1819,18 @@
   </Match>
   <Match>
     <!-- Deliberate hack for the purposes of the test -->
+    <Class 
name="org.apache.catalina.core.TestAsyncContextImpl$Bug49528Servlet"/>
+    <Method name="doGet"/>
+    <Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT"/>
+  </Match>
+  <Match>
+    <!-- Deliberate hack for the purposes of the test -->
+    <Class 
name="org.apache.catalina.core.TestAsyncContextImpl$Bug49528Servlet$1"/>
+    <Method name="run"/>
+    <Bug pattern="DCN_NULLPOINTER_EXCEPTION"/>
+  </Match>
+  <Match>
+    <!-- Deliberate hack for the purposes of the test -->
     <Or>
       <Class 
name="org.apache.catalina.core.TestAsyncContextImpl$Bug49528Servlet"/>
       <Class 
name="org.apache.catalina.core.TestAsyncContextImpl$Bug49567Servlet"/>
@@ -1822,6 +1840,18 @@
   </Match>
   <Match>
     <!-- Deliberate hack for the purposes of the test -->
+    <Class 
name="org.apache.catalina.core.TestAsyncContextImpl$Bug49567Servlet"/>
+    <Method name="doGet"/>
+    <Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT"/>
+  </Match>
+  <Match>
+    <!-- Deliberate hack for the purposes of the test -->
+    <Class 
name="org.apache.catalina.core.TestAsyncContextImpl$Bug49567Servlet$1$1"/>
+    <Method name="run"/>
+    <Bug pattern="DCN_NULLPOINTER_EXCEPTION"/>
+  </Match>
+  <Match>
+    <!-- Deliberate hack for the purposes of the test -->
     <Class 
name="org.apache.catalina.core.TestAsyncContextImpl$Bug53843ServletA"/>
     <Field name="isAsyncWhenExpected"/>
     <Bug pattern="MSF_MUTABLE_SERVLET_FIELD"/>
@@ -2400,35 +2430,26 @@
     </Or>
   </Match>
   <Match>
-    <!-- Array contents is not mutated -->
-    <Class 
name="org.apache.tomcat.websocket.pojo.TestEncodingDecoding$MsgByte"/>
-    <Field name="data"/>
-    <Bug pattern="VO_VOLATILE_REFERENCE_TO_ARRAY"/>
-  </Match>
-  <Match>
     <!-- Return value of latch is intentionally ignored -->
     <Or>
       <Class name="org.apache.tomcat.websocket.TestWebSocketFrameClient"/>
       <Class name="org.apache.tomcat.websocket.TestWebSocketFrameClientSSL"/>
     </Or>
-    <Method name="testConnectToServerEndpoint"/>
+    <Or>
+      <Method name="testConnectToServerEndpoint"/>
+      <Method name="testConnectToServerEndpointLegacy"/>
+    </Or>
     <Bug pattern="RV_RETURN_VALUE_IGNORED"/>
   </Match>
   <Match>
     <!-- Statics are used deliberately as they are simpler -->
-    <Class name="org.apache.tomcat.websocket.server.TestClose" />
-    <Method name="setUp" />
-    <Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD"/>
-  </Match>
-  <Match>
-    <!-- Statics are used deliberately as they are simpler -->
     <Class 
name="org.apache.tomcat.websocket.TestWsSubprotocols$SubProtocolsEndpoint" />
     <Field name="subprotocols" />
     <Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD"/>
   </Match>
   <Match>
     <!-- Statics are used deliberately as they are simpler -->
-    <Class 
name="org.apache.tomcat.websocket.TestWsWebSocketContainer$ConstantTxEndpoint" 
/>
+    <Class 
name="org.apache.tomcat.websocket.TestWsWebSocketContainerTimeoutServer$ConstantTxEndpoint"
 />
     <Or>
       <Field name="exception" />
       <Field name="running" />
@@ -2437,6 +2458,18 @@
     <Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD"/>
   </Match>
   <Match>
+    <!-- Array contents is not mutated -->
+    <Class 
name="org.apache.tomcat.websocket.pojo.TestEncodingDecoding$MsgByte"/>
+    <Field name="data"/>
+    <Bug pattern="VO_VOLATILE_REFERENCE_TO_ARRAY"/>
+  </Match>
+  <Match>
+    <!-- Statics are used deliberately as they are simpler -->
+    <Class name="org.apache.tomcat.websocket.server.TestClose" />
+    <Method name="setUp" />
+    <Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD"/>
+  </Match>
+  <Match>
     <!-- Code is deliberately unused -->
     <Class name="org.apache.tomcat.websocket.server.TestUriTemplate" />
     <Or>

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

Reply via email to