[tomcat] branch 8.5.x updated: Fix deprecation warnings in IDE

[markt]

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


The following commit(s) were added to refs/heads/8.5.x by this push:
     new a2110be96d Fix deprecation warnings in IDE
a2110be96d is described below

commit a2110be96dc76a4cef5f6372eae3e42e31e04cb7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon May 30 20:54:35 2022 +0100

    Fix deprecation warnings in IDE
---
 java/org/apache/tomcat/util/net/Acceptor.java        | 6 +++---
 test/org/apache/tomcat/util/net/TestXxxEndpoint.java | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/Acceptor.java 
b/java/org/apache/tomcat/util/net/Acceptor.java
index 3fa4f965a3..bbfd8dd695 100644
--- a/java/org/apache/tomcat/util/net/Acceptor.java
+++ b/java/org/apache/tomcat/util/net/Acceptor.java
@@ -21,7 +21,6 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.jni.Error;
 import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.res.StringManager;
 
@@ -65,6 +64,7 @@ public class Acceptor<U> implements Runnable {
     }
 
 
+    @SuppressWarnings("deprecation")
     @Override
     public void run() {
 
@@ -157,8 +157,8 @@ public class Acceptor<U> implements Runnable {
                     String msg = sm.getString("endpoint.accept.fail");
                     // APR specific.
                     // Could push this down but not sure it is worth the 
trouble.
-                    if (t instanceof Error) {
-                        Error e = (Error) t;
+                    if (t instanceof org.apache.tomcat.jni.Error) {
+                        org.apache.tomcat.jni.Error e = 
(org.apache.tomcat.jni.Error) t;
                         if (e.getError() == 233) {
                             // Not an error on HP-UX so log as a warning
                             // so it can be filtered out on that platform
diff --git a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java 
b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
index e13713b499..b355460aea 100644
--- a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
+++ b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
@@ -27,7 +27,6 @@ import org.apache.catalina.connector.Connector;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.jni.Address;
-import org.apache.tomcat.jni.Error;
 import org.apache.tomcat.jni.OS;
 import org.apache.tomcat.jni.Pool;
 import org.apache.tomcat.jni.Socket;
@@ -49,6 +48,7 @@ public class TestXxxEndpoint extends TomcatBaseTest {
         }
     }
 
+    @SuppressWarnings("deprecation")
     private long createAprSocket(int port, long pool)
                  throws Exception {
         /**
@@ -82,8 +82,8 @@ public class TestXxxEndpoint extends TomcatBaseTest {
         // Bind the server socket
         int ret = Socket.bind(serverSock, inetAddress);
         if (ret != 0) {
-            log.error("Could not bind: " + Error.strerror(ret));
-            throw (new Exception(Error.strerror(ret)));
+            log.error("Could not bind: " + 
org.apache.tomcat.jni.Error.strerror(ret));
+            throw (new Exception(org.apache.tomcat.jni.Error.strerror(ret)));
         }
         return serverSock;
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org