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/10/22 18:16:45 UTC
[tomcat] branch 7.0.x updated (0ddfd8a -> 6902e36)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 0ddfd8a Added .vscode to .gitignore
new 7f05c89 SpotBugs - fix potential concurrency issue
new 42d0454 Fix previous merge conflict.
new a7217c8 Add missing annotation
new 6902e36 Remove unnecessary annotation
The 4 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:
java/org/apache/catalina/core/ApplicationFilterFactory.java | 2 +-
java/org/apache/catalina/loader/WebappClassLoaderBase.java | 1 -
java/org/apache/catalina/servlets/DefaultServlet.java | 9 ---------
java/org/apache/coyote/http11/AbstractInputBuffer.java | 1 +
4 files changed, 2 insertions(+), 11 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 04/04: Remove unnecessary annotation
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6902e3647457b609954afc90b0bad8bde4e0852b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Oct 22 10:59:17 2020 +0100
Remove unnecessary annotation
---
java/org/apache/catalina/loader/WebappClassLoaderBase.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index c8d0683..a9bfdce 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -1822,7 +1822,6 @@ public abstract class WebappClassLoaderBase extends URLClassLoader
*
* @exception ClassNotFoundException if the class was not found
*/
- @SuppressWarnings("sync-override")
@Override
public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/04: Add missing annotation
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a7217c837f133153a1a0df6bb9b9837efafe4b02
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Oct 22 10:58:40 2020 +0100
Add missing annotation
---
java/org/apache/coyote/http11/AbstractInputBuffer.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/coyote/http11/AbstractInputBuffer.java b/java/org/apache/coyote/http11/AbstractInputBuffer.java
index b08194b..898bc61 100644
--- a/java/org/apache/coyote/http11/AbstractInputBuffer.java
+++ b/java/org/apache/coyote/http11/AbstractInputBuffer.java
@@ -290,6 +290,7 @@ public abstract class AbstractInputBuffer<S> implements InputBuffer{
* Available bytes in the buffers (note that due to encoding, this may not
* correspond).
*/
+ @Override
public int available() {
int result = (lastValid - pos);
if ((result == 0) && (lastActiveFilter >= 0)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/04: SpotBugs - fix potential concurrency issue
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7f05c89106653fb09b5758f99190814469c9f04a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Oct 22 10:49:06 2020 +0100
SpotBugs - fix potential concurrency issue
---
java/org/apache/catalina/core/ApplicationFilterFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/ApplicationFilterFactory.java b/java/org/apache/catalina/core/ApplicationFilterFactory.java
index d2967fe..4dbb679 100644
--- a/java/org/apache/catalina/core/ApplicationFilterFactory.java
+++ b/java/org/apache/catalina/core/ApplicationFilterFactory.java
@@ -52,7 +52,7 @@ public final class ApplicationFilterFactory {
public static final String DISPATCHER_REQUEST_PATH_ATTR =
Globals.DISPATCHER_REQUEST_PATH_ATTR;
- private static ApplicationFilterFactory factory = null;
+ private static volatile ApplicationFilterFactory factory = null;
// ----------------------------------------------------------- Constructors
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/04: Fix previous merge conflict.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 42d04541ea098c877391672a249a6554f21c2669
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Oct 22 10:57:13 2020 +0100
Fix previous merge conflict.
---
java/org/apache/catalina/servlets/DefaultServlet.java | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java
index c03303d..a34b2ac 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -2073,18 +2073,9 @@ public class DefaultServlet extends HttpServlet {
/**
-<<<<<<< HEAD
- * Provides the entity tag (the ETag header) for the given resource
- * attributes. Intended to be over-ridden by custom DefaultServlet
- * implementations that wish to use an alternative format for the entity
- * tag. Such custom implementations that generate strong entity tags may
- * also want to change the default value of
- * {@link #useWeakComparisonWithIfMatch}.
-=======
* Provides the entity tag (the ETag header) for the given resource.
* Intended to be over-ridden by custom DefaultServlet implementations that
* wish to use an alternative format for the entity tag.
->>>>>>> bc379af8e3... Further ETag fixes
*
* @param resourceAttributes The resource attributes for which an entity
* tag is required.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org