This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 0728603ff2 Cleanup
0728603ff2 is described below
commit 0728603ff2b2916b70c368dc51e352ba8cce4190
Author: remm <[email protected]>
AuthorDate: Tue Dec 12 11:41:53 2023 +0100
Cleanup
@SuppressWarnings("unused") is not useful with the new pattern since
this implements an interface method.
---
.../apache/tomcat/util/net/openssl/panama/OpenSSLContext.java | 11 ++++-------
.../apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java | 2 +-
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index 46c7a8ef39..729635a942 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -710,8 +710,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
// DH *(*tmp_dh_callback)(SSL *ssl, int is_export, int keylength)
private static class TmpDHCallback implements
SSL_CTX_set_tmp_dh_callback$dh {
@Override
- public MemorySegment apply(MemorySegment ssl,
@SuppressWarnings("unused") int isExport,
- @SuppressWarnings("unused") int keylength) {
+ public MemorySegment apply(MemorySegment ssl, int isExport, int
keylength) {
var pkey = SSL_get_privatekey(ssl);
int type = (MemorySegment.NULL.equals(pkey)) ? EVP_PKEY_NONE() :
EVP_PKEY_base_id(pkey);
/*
@@ -743,7 +742,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
// const unsigned char *in, unsigned int inlen, void *arg)
private static class ALPNSelectCallback implements
SSL_CTX_set_alpn_select_cb$cb {
@Override
- public int apply(@SuppressWarnings("unused") MemorySegment ssl,
MemorySegment out,
+ public int apply(MemorySegment ssl, MemorySegment out,
MemorySegment outlen, MemorySegment in, int inlen,
MemorySegment arg) {
ContextState state = getState(arg);
if (state == null) {
@@ -920,8 +919,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
private static class PasswordCallback implements
SSL_CTX_set_default_passwd_cb$cb {
@Override
- public int apply(MemorySegment /*char **/ buf, int bufsiz,
- @SuppressWarnings("unused") int verify,
@SuppressWarnings("unused") MemorySegment /*void **/ cb) {
+ public int apply(MemorySegment /* char **/ buf, int bufsiz, int
verify, MemorySegment /* void **/ cb) {
if (log.isDebugEnabled()) {
log.debug("Return password for certificate");
}
@@ -1462,8 +1460,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
@Override
public void accept(MemorySegment t) {
SSL_CONF_CTX_free(t);
- }
- });
+ }});
} else {
this.confCtx = null;
}
diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
index 9bbd9881e9..f02d0b77ea 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
@@ -1147,7 +1147,7 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
private static class InfoCallback implements SSL_set_info_callback$cb {
@Override
- public void apply(MemorySegment ssl, int where,
@SuppressWarnings("unused") int ret) {
+ public void apply(MemorySegment ssl, int where, int ret) {
EngineState state = getState(ssl);
if (state == null) {
log.warn(sm.getString("engine.noSSL",
Long.valueOf(ssl.address())));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
