This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 4150fc00c5 Silence deprecation warnings
4150fc00c5 is described below
commit 4150fc00c555ec40e7c3de96a3aca4958d18ab73
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Aug 4 19:29:35 2023 +0100
Silence deprecation warnings
---
java/org/apache/catalina/connector/CoyoteAdapter.java | 1 +
java/org/apache/catalina/core/AsyncContextImpl.java | 1 +
java/org/apache/catalina/core/StandardHostValve.java | 1 +
java/org/apache/catalina/core/StandardWrapperValve.java | 1 +
java/org/apache/coyote/AbstractProcessor.java | 2 ++
java/org/apache/coyote/http2/Stream.java | 3 +++
6 files changed, 9 insertions(+)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 4242f34fc0..b4f28fbffb 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -553,6 +553,7 @@ public class CoyoteAdapter implements Adapter {
* @throws IOException If there is insufficient space in a buffer
while processing headers
* @throws ServletException If the supported methods of the target servlet
cannot be determined
*/
+ @SuppressWarnings("deprecation")
protected boolean postParseRequest(org.apache.coyote.Request req, Request
request, org.apache.coyote.Response res,
Response response) throws IOException, ServletException {
diff --git a/java/org/apache/catalina/core/AsyncContextImpl.java
b/java/org/apache/catalina/core/AsyncContextImpl.java
index 53b6024315..cceddd1e6a 100644
--- a/java/org/apache/catalina/core/AsyncContextImpl.java
+++ b/java/org/apache/catalina/core/AsyncContextImpl.java
@@ -517,6 +517,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
this.coyoteRequest = coyoteRequest;
}
+ @SuppressWarnings("deprecation")
@Override
public void run() {
ClassLoader oldCL = context.bind(Globals.IS_SECURITY_ENABLED,
null);
diff --git a/java/org/apache/catalina/core/StandardHostValve.java
b/java/org/apache/catalina/core/StandardHostValve.java
index 458b1a2f19..3b3b316dae 100644
--- a/java/org/apache/catalina/core/StandardHostValve.java
+++ b/java/org/apache/catalina/core/StandardHostValve.java
@@ -241,6 +241,7 @@ final class StandardHostValve extends ValveBase {
* @param response The response being generated
* @param throwable The exception that occurred (which possibly wraps a
root cause exception
*/
+ @SuppressWarnings("deprecation")
protected void throwable(Request request, Response response, Throwable
throwable) {
Context context = request.getContext();
if (context == null) {
diff --git a/java/org/apache/catalina/core/StandardWrapperValve.java
b/java/org/apache/catalina/core/StandardWrapperValve.java
index bbbda3ca8a..35a2acba84 100644
--- a/java/org/apache/catalina/core/StandardWrapperValve.java
+++ b/java/org/apache/catalina/core/StandardWrapperValve.java
@@ -270,6 +270,7 @@ final class StandardWrapperValve extends ValveBase {
* @param response The response being generated
* @param exception The exception that occurred (which possibly wraps a
root cause exception
*/
+ @SuppressWarnings("deprecation")
private void exception(Request request, Response response, Throwable
exception) {
request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, exception);
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
diff --git a/java/org/apache/coyote/AbstractProcessor.java
b/java/org/apache/coyote/AbstractProcessor.java
index b63eeae02e..bb79a58091 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -99,6 +99,7 @@ public abstract class AbstractProcessor extends
AbstractProcessorLight implement
* @param errorState The error status details
* @param t The error which occurred
*/
+ @SuppressWarnings("deprecation")
protected void setErrorState(ErrorState errorState, Throwable t) {
if (getLog().isDebugEnabled()) {
getLog().debug(sm.getString("abstractProcessor.setErrorState",
errorState), t);
@@ -1003,6 +1004,7 @@ public abstract class AbstractProcessor extends
AbstractProcessorLight implement
protected abstract SocketState dispatchEndRequest() throws IOException;
+ @SuppressWarnings("deprecation")
@Override
protected final void logAccess(SocketWrapperBase<?> socketWrapper) throws
IOException {
// Set the socket wrapper so the access log can read the socket related
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 51170e9935..fbe67a6e69 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -111,6 +111,7 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
}
+ @SuppressWarnings("deprecation")
Stream(Integer identifier, Http2UpgradeHandler handler, Request
coyoteRequest) {
super(handler.getConnectionId(), identifier);
this.handler = handler;
@@ -278,6 +279,7 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
}
+ @SuppressWarnings("deprecation")
void doStreamCancel(String msg, Http2Error error) throws CloseNowException
{
StreamException se = new StreamException(msg, error, getIdAsInt());
// Prevent the application making further writes
@@ -1189,6 +1191,7 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
private volatile boolean closed;
private boolean resetReceived;
+ @SuppressWarnings("deprecation")
@Override
public final int doRead(ApplicationBufferHandler
applicationBufferHandler) throws IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
