This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new b330d82960 Silence deprecation warnings
b330d82960 is described below
commit b330d82960811662072d013b52741c467303f147
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Aug 4 19:31:15 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 c0eb3307cd..28bf20ead7 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -555,6 +555,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 c7a8f1d878..56ef57ae44 100644
--- a/java/org/apache/catalina/core/AsyncContextImpl.java
+++ b/java/org/apache/catalina/core/AsyncContextImpl.java
@@ -516,6 +516,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 3b50dfefee..b7aaad0dd1 100644
--- a/java/org/apache/catalina/core/StandardHostValve.java
+++ b/java/org/apache/catalina/core/StandardHostValve.java
@@ -256,6 +256,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 4ed7d22e1a..80da74e13a 100644
--- a/java/org/apache/catalina/core/StandardWrapperValve.java
+++ b/java/org/apache/catalina/core/StandardWrapperValve.java
@@ -271,6 +271,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 bbc3838ed4..6db9347af8 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -98,6 +98,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);
@@ -1012,6 +1013,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 ec80af2707..74c6216387 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -112,6 +112,7 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
}
+ @SuppressWarnings("deprecation")
Stream(Integer identifier, Http2UpgradeHandler handler, Request
coyoteRequest) {
super(handler.getConnectionId(), identifier);
this.handler = handler;
@@ -279,6 +280,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
@@ -1187,6 +1189,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]
