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 2020/03/06 12:49:40 UTC
[tomcat] branch 8.5.x updated (fef28be -> 8e05e9f)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from fef28be Increment version for next development cycle
new 1544833 Fix SpotBugs issues in unit tests
new 8e05e9f A handful of additional false positives
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 | 22 ++++++++++++++++++++++
.../http11/upgrade/TestUpgradeInternalHandler.java | 2 +-
test/org/apache/coyote/http2/TestAsyncTimeout.java | 6 +++---
3 files changed, 26 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: A handful of additional false positives
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 8e05e9f901bc7f5225bf8823e0edcf55dbebc43a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Mar 6 12:49:26 2020 +0000
A handful of additional false positives
---
res/findbugs/filter-false-positives.xml | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml
index 23c272a..ba2e9a2 100644
--- a/res/findbugs/filter-false-positives.xml
+++ b/res/findbugs/filter-false-positives.xml
@@ -1458,6 +1458,21 @@
<Bug code="SF" />
</Match>
<Match>
+ <!-- Single condition. notify() is OK -->
+ <Class name="org.apache.tomcat.util.net.SocketWrapperBase" />
+ <Method name="vectoredOperation"/>
+ <Bug pattern="WA_NOT_IN_LOOP" />
+ </Match>
+ <Match>
+ <!-- Single condition. notify() is OK -->
+ <Class name="org.apache.tomcat.util.net.SocketWrapperBase$VectoredIOCompletionHandler" />
+ <Or>
+ <Method name="completed"/>
+ <Method name="failed"/>
+ </Or>
+ <Bug pattern="NO_NOTIFY_NOT_NOTIFYALL" />
+ </Match>
+ <Match>
<!-- Stream will be closed -->
<Class name="org.apache.tomcat.util.net.jsse.PEMFile" />
<Method name="<init>" />
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Fix SpotBugs issues in unit tests
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 154483315d7dab3b6949979a58c1d200d43b12b8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Mar 6 12:33:29 2020 +0000
Fix SpotBugs issues in unit tests
---
res/findbugs/filter-false-positives.xml | 7 +++++++
.../apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java | 2 +-
test/org/apache/coyote/http2/TestAsyncTimeout.java | 6 +++---
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml
index b45c160..23c272a 100644
--- a/res/findbugs/filter-false-positives.xml
+++ b/res/findbugs/filter-false-positives.xml
@@ -1574,6 +1574,7 @@
<Or>
<Method name="testAuthMethodBadMethod"/>
<Method name="testBadBase64Char"/>
+ <Method name="testBadBase64InlineEquals"/>
</Or>
<Bug pattern="DLS_DEAD_LOCAL_STORE"/>
</Match>
@@ -1859,6 +1860,12 @@
<Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD"/>
</Match>
<Match>
+ <!-- Latch isn't essential so no need to check return -->
+ <Class name="org.apache.coyote.http2.TestAsyncTimeout"/>
+ <Method name="testTimeout"/>
+ <Bug pattern="RV_RETURN_VALUE_IGNORED"/>
+ </Match>
+ <Match>
<!-- Result is negated to compare result when order is reversed -->
<Class name="org.apache.el.TestELEvaluation" />
<Method name="compareBoth" />
diff --git a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
index 4f406fc..27bce41 100644
--- a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
+++ b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
@@ -227,7 +227,7 @@ public class TestUpgradeInternalHandler extends TomcatBaseTest {
}, buffer);
System.out.println("CompletionState: " + state);
// Test zero length write used by websockets
- state = wrapper.write(BlockingMode.BLOCK, 10, TimeUnit.SECONDS, null, SocketWrapperBase.COMPLETE_WRITE_WITH_COMPLETION, new CompletionHandler<Long, Void>() {
+ wrapper.write(BlockingMode.BLOCK, 10, TimeUnit.SECONDS, null, SocketWrapperBase.COMPLETE_WRITE_WITH_COMPLETION, new CompletionHandler<Long, Void>() {
@Override
public void completed(Long result, Void attachment) {
System.out.println("Write: " + result.longValue());
diff --git a/test/org/apache/coyote/http2/TestAsyncTimeout.java b/test/org/apache/coyote/http2/TestAsyncTimeout.java
index 1e97490..8560229 100644
--- a/test/org/apache/coyote/http2/TestAsyncTimeout.java
+++ b/test/org/apache/coyote/http2/TestAsyncTimeout.java
@@ -52,8 +52,8 @@ public class TestAsyncTimeout extends Http2TestBase {
// This is the servlet that does that actual test
// This latch is used to signal that that async thread used by the test
- // has ended. It isn;t essential to the test but it allows the test to
- // complete without Tmcat logging an error about a still running thread.
+ // has ended. It isn't essential to the test but it allows the test to
+ // complete without Tomcat logging an error about a still running thread.
CountDownLatch latch = new CountDownLatch(1);
Wrapper w = Tomcat.addServlet(ctxt, "async", new AsyncTimeoutServlet(latch));
w.setAsyncSupported(true);
@@ -95,7 +95,7 @@ public class TestAsyncTimeout extends Http2TestBase {
private static final long serialVersionUID = 1L;
- private final CountDownLatch latch;
+ private final transient CountDownLatch latch;
public AsyncTimeoutServlet(CountDownLatch latch) {
this.latch = latch;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org