You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/11/20 13:24:36 UTC
[tomcat] branch master updated (9d7cb54 -> 5274de1)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 9d7cb54 Fix test
new 13c87be Remove unused code
new 5274de1 Alphabetical order
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
res/findbugs/filter-false-positives.xml | 46 +++++++++++-----------
.../tribes/test/transport/SocketNioReceive.java | 1 +
2 files changed, 24 insertions(+), 23 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Alphabetical order
Posted by ma...@apache.org.
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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Remove unused code
Posted by ma...@apache.org.
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/13c87becb4bf1c57cc5125604ab7ce7b66948a20
commit 13c87becb4bf1c57cc5125604ab7ce7b66948a20
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Nov 20 13:24:02 2019 +0000
Remove unused code
---
test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java b/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java
index 9ec2afa..763d7b2 100644
--- a/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java
+++ b/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java
@@ -35,6 +35,7 @@ public class SocketNioReceive {
static DecimalFormat df = new DecimalFormat("##.00");
static double seconds = 0;
+ protected static final Object mutex = new Object();
public static void main(String[] args) throws Exception {
Member mbr = new MemberImpl("localhost", 9999, 0);
ChannelData data = new ChannelData();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org