(tomcat) branch main updated (1692b97445 -> e9248266e6)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from 1692b97445 Error dispatch must now always use GET new fd6ddb6fc1 Fix IDE warnings new 33232721f3 Remove unused imports when cleaning up code new b91af3e5c3 Code clean - formatting. No functional change. new fd62cce79b Add missing Javadoc new 706985b67d Suppress warnings in generated code new 3a0a8b106a Suppress warnings in generated code new d2f721dfe1 Remove unnecessary code new e9248266e6 Fix warnings / widen background process / lifecycle fix The 8 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/StandardContext.java |2 +- java/org/apache/catalina/core/StandardWrapper.java |2 +- java/org/apache/catalina/startup/HostConfig.java |6 +- .../util/net/openssl/panama/OpenSSLContext.java| 26 +- .../util/net/openssl/panama/OpenSSLEngine.java |2 +- .../util/net/openssl/panama/OpenSSLLibrary.java|3 + .../net/openssl/panama/OpenSSLSessionContext.java |3 +- .../apache/tomcat/util/openssl/RuntimeHelper.java | 62 +- .../SSL_CTX_set_cert_verify_callback$cb.java | 14 +- .../openssl/SSL_CTX_set_tmp_dh_callback$dh.java| 14 +- .../util/openssl/SSL_set_info_callback$cb.java | 12 +- .../apache/tomcat/util/openssl/constants$0.java| 33 +- .../apache/tomcat/util/openssl/constants$1.java| 38 +- .../apache/tomcat/util/openssl/constants$10.java | 42 +- .../apache/tomcat/util/openssl/constants$11.java | 41 +- .../apache/tomcat/util/openssl/constants$12.java | 41 +- .../apache/tomcat/util/openssl/constants$13.java | 48 +- .../apache/tomcat/util/openssl/constants$14.java | 41 +- .../apache/tomcat/util/openssl/constants$15.java | 41 +- .../apache/tomcat/util/openssl/constants$16.java | 40 +- .../apache/tomcat/util/openssl/constants$17.java | 40 +- .../apache/tomcat/util/openssl/constants$18.java | 45 +- .../apache/tomcat/util/openssl/constants$19.java | 42 +- .../apache/tomcat/util/openssl/constants$2.java| 34 +- .../apache/tomcat/util/openssl/constants$20.java | 38 +- .../apache/tomcat/util/openssl/constants$21.java | 41 +- .../apache/tomcat/util/openssl/constants$22.java | 40 +- .../apache/tomcat/util/openssl/constants$23.java | 40 +- .../apache/tomcat/util/openssl/constants$24.java | 42 +- .../apache/tomcat/util/openssl/constants$25.java | 42 +- .../apache/tomcat/util/openssl/constants$26.java | 36 +- .../apache/tomcat/util/openssl/constants$27.java | 34 +- .../apache/tomcat/util/openssl/constants$28.java | 38 +- .../apache/tomcat/util/openssl/constants$29.java | 38 +- .../apache/tomcat/util/openssl/constants$3.java| 43 +- .../apache/tomcat/util/openssl/constants$30.java | 34 +- .../apache/tomcat/util/openssl/constants$31.java | 42 +- .../apache/tomcat/util/openssl/constants$32.java | 42 +- .../apache/tomcat/util/openssl/constants$33.java | 40 +- .../apache/tomcat/util/openssl/constants$34.java | 40 +- .../apache/tomcat/util/openssl/constants$35.java | 32 +- .../apache/tomcat/util/openssl/constants$4.java| 46 +- .../apache/tomcat/util/openssl/constants$5.java| 40 +- .../apache/tomcat/util/openssl/constants$6.java| 46 +- .../apache/tomcat/util/openssl/constants$7.java| 38 +- .../apache/tomcat/util/openssl/constants$8.java| 40 +- .../apache/tomcat/util/openssl/constants$9.java| 42 +- java/org/apache/tomcat/util/openssl/openssl_h.java | 2054 +++- .../util/openssl/openssl_h_Compatibility.java | 56 +- .../tomcat/util/openssl/openssl_h_Macros.java | 150 +- res/ide-support/eclipse/clean-up-asf-tomcat.xml|2 +- 51 files changed, 1700 insertions(+), 2148 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 04/08: Add missing Javadoc
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit fd62cce79bb255804b93c2b04d3673917900a575
Author: Mark Thomas
AuthorDate: Fri Nov 24 17:05:31 2023 +
Add missing Javadoc
---
java/org/apache/tomcat/util/openssl/openssl_h_Macros.java | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/tomcat/util/openssl/openssl_h_Macros.java
b/java/org/apache/tomcat/util/openssl/openssl_h_Macros.java
index 282a0ec96e..8605351924 100644
--- a/java/org/apache/tomcat/util/openssl/openssl_h_Macros.java
+++ b/java/org/apache/tomcat/util/openssl/openssl_h_Macros.java
@@ -60,7 +60,6 @@ public class openssl_h_Macros {
* SSL_CTRL_GET_SESS_CACHE_SIZE, 0, NULL)
*
* @param sslCtxthe SSL context
- * @param cacheSize the session cache size
*
* @return > 0 if successful
*/
@@ -182,6 +181,8 @@ public class openssl_h_Macros {
/**
* Free memory. # define OPENSSL_free(addr) \ CRYPTO_free(addr,
OPENSSL_FILE, OPENSSL_LINE)
+ *
+ * @param segment The address to free
*/
public static void OPENSSL_free(MemorySegment segment) {
CRYPTO_free(segment, MemorySegment.NULL, 0);
@@ -190,6 +191,10 @@ public class openssl_h_Macros {
/**
* Reset BIO position. # define BIO_reset(b) \
(int)BIO_ctrl(b,BIO_CTRL_RESET,0,NULL)
+ *
+ * @param bio The BIO to reset
+ *
+ * @return > 0 if successful
*/
public static long BIO_reset(MemorySegment bio) {
return BIO_ctrl(bio, BIO_CTRL_RESET(), 0, MemorySegment.NULL);
@@ -229,11 +234,11 @@ public class openssl_h_Macros {
* Pass a file which will be loaded into the store. # define
X509_LOOKUP_load_file(x,name,type) \
* X509_LOOKUP_ctrl((x),X509_L_FILE_LOAD,(name),(long)(type),NULL)
*
- * @param x509Lookup
- * @param name
- * @param type
+ * @param x509Lookup the X509 lookup
+ * @param name the path name
+ * @param type the type used
*
- * @return
+ * @return > 0 if successful
*/
public static long X509_LOOKUP_load_file(MemorySegment x509Lookup,
MemorySegment name, long type) {
return X509_LOOKUP_ctrl(x509Lookup, X509_L_FILE_LOAD(), name,
X509_FILETYPE_PEM(), MemorySegment.NULL);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 07/08: Remove unnecessary code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d2f721dfe15e15658ea59ebf74767b3d0678171a
Author: Mark Thomas
AuthorDate: Fri Nov 24 17:07:45 2023 +
Remove unnecessary code
---
java/org/apache/catalina/startup/HostConfig.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/startup/HostConfig.java
b/java/org/apache/catalina/startup/HostConfig.java
index 1bdb18f5b5..a04e4f3a46 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -1692,10 +1692,8 @@ public class HostConfig implements LifecycleListener {
*/
public void check(String name) {
synchronized (host) {
-if (host instanceof Lifecycle) {
-if (!((Lifecycle) host).getState().isAvailable()) {
-return;
-}
+if (!((Lifecycle) host).getState().isAvailable()) {
+return;
}
if (tryAddServiced(name)) {
try {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 08/08: Fix warnings / widen background process / lifecycle fix
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e9248266e6d8267b0678722928bd2812fbde7680
Author: Mark Thomas
AuthorDate: Fri Nov 24 17:15:16 2023 +
Fix warnings / widen background process / lifecycle fix
---
java/org/apache/catalina/core/StandardContext.java | 2 +-
java/org/apache/catalina/core/StandardWrapper.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index b17e0a0def..91b622d50a 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -5178,7 +5178,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
@Override
-public void backgroundProcess() {
+public synchronized void backgroundProcess() {
if (!getState().isAvailable()) {
return;
diff --git a/java/org/apache/catalina/core/StandardWrapper.java
b/java/org/apache/catalina/core/StandardWrapper.java
index 1bef8ecb81..82aeeda20b 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -505,7 +505,7 @@ public class StandardWrapper extends ContainerBase
implements ServletConfig, Wra
* this container. Unexpected throwables will be caught and logged.
*/
@Override
-public void backgroundProcess() {
+public synchronized void backgroundProcess() {
super.backgroundProcess();
if (!getState().isAvailable()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 05/08: Suppress warnings in generated code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 706985b67d8a060d6804d9b53a12a549545f5dfd
Author: Mark Thomas
AuthorDate: Fri Nov 24 17:05:51 2023 +
Suppress warnings in generated code
---
java/org/apache/tomcat/util/openssl/RuntimeHelper.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/tomcat/util/openssl/RuntimeHelper.java
b/java/org/apache/tomcat/util/openssl/RuntimeHelper.java
index 80459b0059..7c80e9ff64 100644
--- a/java/org/apache/tomcat/util/openssl/RuntimeHelper.java
+++ b/java/org/apache/tomcat/util/openssl/RuntimeHelper.java
@@ -34,6 +34,7 @@ import java.lang.foreign.AddressLayout;
import static java.lang.foreign.ValueLayout.*;
import static java.lang.Long.MAX_VALUE;
+@SuppressWarnings("unused")
final class RuntimeHelper {
private static final Linker LINKER = Linker.nativeLinker();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/08: Fix IDE warnings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit fd6ddb6fc196ebb58432bca4b9ea63c143a1d41b
Author: Mark Thomas
AuthorDate: Fri Nov 24 16:45:56 2023 +
Fix IDE warnings
The volume of warnings is masking genuine issues elsewhere in the code
base
---
.../util/net/openssl/panama/OpenSSLContext.java| 26 ++
.../util/net/openssl/panama/OpenSSLEngine.java | 2 +-
.../util/net/openssl/panama/OpenSSLLibrary.java| 3 +++
.../net/openssl/panama/OpenSSLSessionContext.java | 3 ++-
4 files changed, 23 insertions(+), 11 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 1a70d72c63..74e60e9bba 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -333,13 +333,15 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
openSSLCallbackPasswordFunctionDescriptor, contextArena);
SSL_CTX_set_default_passwd_cb(sslCtx, openSSLCallbackPassword);
-alpn = (negotiableProtocols != null && negotiableProtocols.size()
> 0);
-if (alpn) {
+if (negotiableProtocols != null && negotiableProtocols.size() > 0)
{
+alpn = true;
negotiableProtocolsBytes = new
ArrayList<>(negotiableProtocols.size() + 1);
for (String negotiableProtocol : negotiableProtocols) {
negotiableProtocolsBytes.add(negotiableProtocol.getBytes(StandardCharsets.ISO_8859_1));
}
negotiableProtocolsBytes.add(HTTP_11_PROTOCOL);
+} else {
+alpn = false;
}
success = true;
@@ -737,7 +739,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
// this is set so always set it in case an app is configured to
// require it
sessionContext.setSessionIdContext(DEFAULT_SESSION_ID_CONTEXT);
-sslHostConfig.setOpenSslContext(state.sslCtx.address());
+
sslHostConfig.setOpenSslContext(Long.valueOf(state.sslCtx.address()));
initialized = true;
} catch (Exception e) {
log.warn(sm.getString("openssl.errorSSLCtxInit"), e);
@@ -754,7 +756,9 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
}
// DH *(*tmp_dh_callback)(SSL *ssl, int is_export, int keylength)
-public static MemorySegment openSSLCallbackTmpDH(MemorySegment ssl, int
isExport, int keylength) {
+@SuppressWarnings("deprecation")
+public static MemorySegment openSSLCallbackTmpDH(MemorySegment ssl,
@SuppressWarnings("unused") int isExport,
+@SuppressWarnings("unused") int keylength) {
var pkey = SSL_get_privatekey(ssl);
int type = (MemorySegment.NULL.equals(pkey)) ? EVP_PKEY_NONE() :
EVP_PKEY_base_id(pkey);
/*
@@ -783,8 +787,8 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
// int SSL_callback_alpn_select_proto(SSL* ssl, const unsigned char **out,
unsigned char *outlen,
//const unsigned char *in, unsigned int inlen, void *arg)
-public static int openSSLCallbackAlpnSelectProto(MemorySegment ssl,
MemorySegment out, MemorySegment outlen,
-MemorySegment in, int inlen, MemorySegment arg) {
+public static int
openSSLCallbackAlpnSelectProto(@SuppressWarnings("unused") MemorySegment ssl,
MemorySegment out,
+MemorySegment outlen, MemorySegment in, int inlen, MemorySegment
arg) {
ContextState state = getState(arg);
if (state == null) {
log.warn(sm.getString("context.noSSL",
Long.valueOf(arg.address(;
@@ -950,7 +954,8 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
private static ThreadLocal callbackPasswordTheadLocal = new
ThreadLocal<>();
-public static int openSSLCallbackPassword(MemorySegment /*char **/ buf,
int bufsiz, int verify, MemorySegment /*void **/ cb) {
+public static int openSSLCallbackPassword(MemorySegment /*char **/ buf,
int bufsiz,
+@SuppressWarnings("unused") int verify,
@SuppressWarnings("unused") MemorySegment /*void **/ cb) {
if (log.isDebugEnabled()) {
log.debug("Return password for certificate");
}
@@ -972,6 +977,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
}
+@SuppressWarnings("deprecation")
private boolean addCertificate(SSLHostConfigCertificate certificate, Arena
localArena) throws Exception {
int index = getCertificateIndex(certificate);
// Load Server
(tomcat) 02/08: Remove unused imports when cleaning up code
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 33232721f31a0f88a34c71bac9ce42e42de32c9d Author: Mark Thomas AuthorDate: Fri Nov 24 16:52:40 2023 + Remove unused imports when cleaning up code --- res/ide-support/eclipse/clean-up-asf-tomcat.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/ide-support/eclipse/clean-up-asf-tomcat.xml b/res/ide-support/eclipse/clean-up-asf-tomcat.xml index b250c8798a..8f57829edb 100644 --- a/res/ide-support/eclipse/clean-up-asf-tomcat.xml +++ b/res/ide-support/eclipse/clean-up-asf-tomcat.xml @@ -29,7 +29,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 06/08: Suppress warnings in generated code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3a0a8b106ac7da56810e1110120a482468fb4256
Author: Mark Thomas
AuthorDate: Fri Nov 24 17:07:07 2023 +
Suppress warnings in generated code
---
.../apache/tomcat/util/openssl/SSL_CTX_set_cert_verify_callback$cb.java | 1 +
java/org/apache/tomcat/util/openssl/SSL_CTX_set_tmp_dh_callback$dh.java | 1 +
java/org/apache/tomcat/util/openssl/SSL_set_info_callback$cb.java| 1 +
java/org/apache/tomcat/util/openssl/openssl_h.java | 1 +
4 files changed, 4 insertions(+)
diff --git
a/java/org/apache/tomcat/util/openssl/SSL_CTX_set_cert_verify_callback$cb.java
b/java/org/apache/tomcat/util/openssl/SSL_CTX_set_cert_verify_callback$cb.java
index 06a7502aaf..aaaef2f559 100644
---
a/java/org/apache/tomcat/util/openssl/SSL_CTX_set_cert_verify_callback$cb.java
+++
b/java/org/apache/tomcat/util/openssl/SSL_CTX_set_cert_verify_callback$cb.java
@@ -25,6 +25,7 @@ import java.lang.foreign.*;
* {@snippet : * int
(*SSL_CTX_set_cert_verify_callback$cb)(X509_STORE_CTX*,void*);
* }
*/
+@SuppressWarnings("javadoc")
public interface SSL_CTX_set_cert_verify_callback$cb {
int apply(java.lang.foreign.MemorySegment _x0,
java.lang.foreign.MemorySegment _x1);
diff --git
a/java/org/apache/tomcat/util/openssl/SSL_CTX_set_tmp_dh_callback$dh.java
b/java/org/apache/tomcat/util/openssl/SSL_CTX_set_tmp_dh_callback$dh.java
index a19fcf86e6..f832e33d45 100644
--- a/java/org/apache/tomcat/util/openssl/SSL_CTX_set_tmp_dh_callback$dh.java
+++ b/java/org/apache/tomcat/util/openssl/SSL_CTX_set_tmp_dh_callback$dh.java
@@ -25,6 +25,7 @@ import java.lang.foreign.*;
* {@snippet : * DH* (*SSL_CTX_set_tmp_dh_callback$dh)(SSL*,int,int);
* }
*/
+@SuppressWarnings("javadoc")
public interface SSL_CTX_set_tmp_dh_callback$dh {
java.lang.foreign.MemorySegment apply(java.lang.foreign.MemorySegment _x0,
int _x1, int _x2);
diff --git a/java/org/apache/tomcat/util/openssl/SSL_set_info_callback$cb.java
b/java/org/apache/tomcat/util/openssl/SSL_set_info_callback$cb.java
index aeb54ca670..eccbdac57f 100644
--- a/java/org/apache/tomcat/util/openssl/SSL_set_info_callback$cb.java
+++ b/java/org/apache/tomcat/util/openssl/SSL_set_info_callback$cb.java
@@ -25,6 +25,7 @@ import java.lang.foreign.*;
* {@snippet : * void (*SSL_set_info_callback$cb)(const SSL*,int,int);
* }
*/
+@SuppressWarnings("javadoc")
public interface SSL_set_info_callback$cb {
void apply(java.lang.foreign.MemorySegment _x0, int _x1, int _x2);
diff --git a/java/org/apache/tomcat/util/openssl/openssl_h.java
b/java/org/apache/tomcat/util/openssl/openssl_h.java
index a270d74757..71b62fc0cc 100644
--- a/java/org/apache/tomcat/util/openssl/openssl_h.java
+++ b/java/org/apache/tomcat/util/openssl/openssl_h.java
@@ -23,6 +23,7 @@ import java.lang.invoke.MethodHandle;
import java.lang.foreign.*;
import static java.lang.foreign.ValueLayout.*;
+@SuppressWarnings("javadoc")
public class openssl_h {
public static final OfByte C_CHAR = JAVA_BYTE;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Remove unnecessary code
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
commit a008e060ae308f42c6d1a71c985d38a7ee8b45b5
Author: Mark Thomas
AuthorDate: Fri Nov 24 17:07:45 2023 +
Remove unnecessary code
---
java/org/apache/catalina/startup/HostConfig.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/startup/HostConfig.java
b/java/org/apache/catalina/startup/HostConfig.java
index fecfb3fc49..43b8d46b25 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -1725,10 +1725,8 @@ public class HostConfig implements LifecycleListener {
*/
public void check(String name) {
synchronized (host) {
-if (host instanceof Lifecycle) {
-if (!((Lifecycle) host).getState().isAvailable()) {
-return;
-}
+if (!((Lifecycle) host).getState().isAvailable()) {
+return;
}
if (tryAddServiced(name)) {
try {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Fix warnings / widen background process / lifecycle fix
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
commit 385cf3a6b26cea3a510924d9a96f93b4cd9b16b8
Author: Mark Thomas
AuthorDate: Fri Nov 24 17:15:16 2023 +
Fix warnings / widen background process / lifecycle fix
---
java/org/apache/catalina/core/StandardContext.java | 2 +-
java/org/apache/catalina/core/StandardWrapper.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index fddaf9c8ed..e4a701872b 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -5210,7 +5210,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
@Override
-public void backgroundProcess() {
+public synchronized void backgroundProcess() {
if (!getState().isAvailable()) {
return;
diff --git a/java/org/apache/catalina/core/StandardWrapper.java
b/java/org/apache/catalina/core/StandardWrapper.java
index ec9022a0d7..66ad053e1a 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -512,7 +512,7 @@ public class StandardWrapper extends ContainerBase
implements ServletConfig, Wra
* this container. Unexpected throwables will be caught and logged.
*/
@Override
-public void backgroundProcess() {
+public synchronized void backgroundProcess() {
super.backgroundProcess();
if (!getState().isAvailable()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated (97c1d3f461 -> 385cf3a6b2)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 97c1d3f461 Version bump new a008e060ae Remove unnecessary code new 385cf3a6b2 Fix warnings / widen background process / lifecycle fix The 2 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/StandardContext.java | 2 +- java/org/apache/catalina/core/StandardWrapper.java | 2 +- java/org/apache/catalina/startup/HostConfig.java | 6 ++ 3 files changed, 4 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Remove unnecessary code
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
commit 172571caced9000cdf4c42b807aadea1a661a3b4
Author: Mark Thomas
AuthorDate: Fri Nov 24 17:07:45 2023 +
Remove unnecessary code
---
java/org/apache/catalina/startup/HostConfig.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/startup/HostConfig.java
b/java/org/apache/catalina/startup/HostConfig.java
index f626961d94..dcb1e5c9b3 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -1683,10 +1683,8 @@ public class HostConfig implements LifecycleListener {
*/
public void check(String name) {
synchronized (host) {
-if (host instanceof Lifecycle) {
-if (!((Lifecycle) host).getState().isAvailable()) {
-return;
-}
+if (!((Lifecycle) host).getState().isAvailable()) {
+return;
}
if (tryAddServiced(name)) {
try {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Fix warnings / widen background process / lifecycle fix
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
commit 8649a89e1b6170b73bca01d60d6425e9b59bd9f1
Author: Mark Thomas
AuthorDate: Fri Nov 24 17:15:16 2023 +
Fix warnings / widen background process / lifecycle fix
---
java/org/apache/catalina/core/StandardContext.java | 2 +-
java/org/apache/catalina/core/StandardWrapper.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index 58d8cf93dc..02b35d196a 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -5264,7 +5264,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
@Override
-public void backgroundProcess() {
+public synchronized void backgroundProcess() {
if (!getState().isAvailable()) {
return;
diff --git a/java/org/apache/catalina/core/StandardWrapper.java
b/java/org/apache/catalina/core/StandardWrapper.java
index 0c0cdb7d40..fda1847dee 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -601,7 +601,7 @@ public class StandardWrapper extends ContainerBase
implements ServletConfig, Wra
* this container. Unexpected throwables will be caught and logged.
*/
@Override
-public void backgroundProcess() {
+public synchronized void backgroundProcess() {
super.backgroundProcess();
if (!getState().isAvailable()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated (e97703fcf3 -> 8649a89e1b)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from e97703fcf3 Fix sync inconsistency on host config object vs host object new 172571cace Remove unnecessary code new 8649a89e1b Fix warnings / widen background process / lifecycle fix The 2 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/StandardContext.java | 2 +- java/org/apache/catalina/core/StandardWrapper.java | 2 +- java/org/apache/catalina/startup/HostConfig.java | 6 ++ 3 files changed, 4 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Remove unnecessary code
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
commit 3c74235c1313bab662512acbd59335b1375cc529
Author: Mark Thomas
AuthorDate: Fri Nov 24 17:07:45 2023 +
Remove unnecessary code
---
java/org/apache/catalina/startup/HostConfig.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/startup/HostConfig.java
b/java/org/apache/catalina/startup/HostConfig.java
index 067d4dab58..8b5da43a4c 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -1676,10 +1676,8 @@ public class HostConfig implements LifecycleListener {
*/
public void check(String name) {
synchronized (host) {
-if (host instanceof Lifecycle) {
-if (!((Lifecycle) host).getState().isAvailable()) {
-return;
-}
+if (!((Lifecycle) host).getState().isAvailable()) {
+return;
}
if (tryAddServiced(name)) {
try {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Fix warnings / widen background process / lifecycle fix
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
commit d28ddf4d559038cb4d1752a1e4d0780d1c24c15f
Author: Mark Thomas
AuthorDate: Fri Nov 24 17:15:16 2023 +
Fix warnings / widen background process / lifecycle fix
---
java/org/apache/catalina/core/StandardContext.java | 2 +-
java/org/apache/catalina/core/StandardWrapper.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index 05f96ed8e6..30181ea35e 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -5244,7 +5244,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
@Override
-public void backgroundProcess() {
+public synchronized void backgroundProcess() {
if (!getState().isAvailable()) {
return;
diff --git a/java/org/apache/catalina/core/StandardWrapper.java
b/java/org/apache/catalina/core/StandardWrapper.java
index 8d7b342aca..76eed6384d 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -599,7 +599,7 @@ public class StandardWrapper extends ContainerBase
implements ServletConfig, Wra
* this container. Unexpected throwables will be caught and logged.
*/
@Override
-public void backgroundProcess() {
+public synchronized void backgroundProcess() {
super.backgroundProcess();
if (!getState().isAvailable()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 8.5.x updated (095392c9fc -> d28ddf4d55)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 095392c9fc Fix sync inconsistency on host config object vs host object new 3c74235c13 Remove unnecessary code new d28ddf4d55 Fix warnings / widen background process / lifecycle fix The 2 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/StandardContext.java | 2 +- java/org/apache/catalina/core/StandardWrapper.java | 2 +- java/org/apache/catalina/startup/HostConfig.java | 6 ++ 3 files changed, 4 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
