[Bug 66331] Incorrect exception is being caught in SystemLogHandler
https://bz.apache.org/bugzilla/show_bug.cgi?id=66331 Han Li changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #1 from Han Li --- Thanks for the report. Fixed in: - 10.1.x for 10.1.2 onwards - 9.0.x for 9.0.69 onwards - 8.5.x for 8.5.84 onwards -- You are receiving this mail because: You are the assignee for the bug. - 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: Fix BZ 66331
This is an automated email from the ASF dual-hosted git repository.
lihan 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 1f654363f1 Fix BZ 66331
1f654363f1 is described below
commit 1f654363f1f1ebde4f1fb805b2b978f72bc3bbee
Author: lihan
AuthorDate: Wed Nov 2 10:09:18 2022 +0800
Fix BZ 66331
Fix a regression in refactoring for Stack on the SystemLogHandler which
caught incorrect exception.
---
java/org/apache/tomcat/util/log/SystemLogHandler.java | 4 ++--
webapps/docs/changelog.xml| 5 +
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/log/SystemLogHandler.java
b/java/org/apache/tomcat/util/log/SystemLogHandler.java
index 2293f349af..946d9d6d9b 100644
--- a/java/org/apache/tomcat/util/log/SystemLogHandler.java
+++ b/java/org/apache/tomcat/util/log/SystemLogHandler.java
@@ -20,7 +20,7 @@ import java.io.IOException;
import java.io.PrintStream;
import java.util.ArrayDeque;
import java.util.Deque;
-import java.util.EmptyStackException;
+import java.util.NoSuchElementException;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -83,7 +83,7 @@ public class SystemLogHandler extends PrintStream {
if (!reuse.isEmpty()) {
try {
log = reuse.remove();
-} catch (EmptyStackException e) {
+} catch (NoSuchElementException e) {
log = new CaptureLog();
}
} else {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bbbd2e97c9..b778b75c52 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -114,6 +114,11 @@
Context was ignored and the default was always used.
(markt)
+
+66331: Fix a regression in refactoring for
Stack
+on the SystemLogHandler which caught incorrect exception.
+(lihan)
+
-
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: Fix BZ 66331
This is an automated email from the ASF dual-hosted git repository.
lihan 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 9c804a3096 Fix BZ 66331
9c804a3096 is described below
commit 9c804a30969ba1c485daf088b2ac32bdc91442fd
Author: lihan
AuthorDate: Wed Nov 2 10:09:18 2022 +0800
Fix BZ 66331
Fix a regression in refactoring for Stack on the SystemLogHandler which
caught incorrect exception.
---
java/org/apache/tomcat/util/log/SystemLogHandler.java | 4 ++--
webapps/docs/changelog.xml| 5 +
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/log/SystemLogHandler.java
b/java/org/apache/tomcat/util/log/SystemLogHandler.java
index 2293f349af..946d9d6d9b 100644
--- a/java/org/apache/tomcat/util/log/SystemLogHandler.java
+++ b/java/org/apache/tomcat/util/log/SystemLogHandler.java
@@ -20,7 +20,7 @@ import java.io.IOException;
import java.io.PrintStream;
import java.util.ArrayDeque;
import java.util.Deque;
-import java.util.EmptyStackException;
+import java.util.NoSuchElementException;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -83,7 +83,7 @@ public class SystemLogHandler extends PrintStream {
if (!reuse.isEmpty()) {
try {
log = reuse.remove();
-} catch (EmptyStackException e) {
+} catch (NoSuchElementException e) {
log = new CaptureLog();
}
} else {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c202144015..41ce90711c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -123,6 +123,11 @@
Context was ignored and the default was always used.
(markt)
+
+66331: Fix a regression in refactoring for
Stack
+on the SystemLogHandler which caught incorrect exception.
+(lihan)
+
-
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: Fix BZ 66331
This is an automated email from the ASF dual-hosted git repository.
lihan 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 130d03c720 Fix BZ 66331
130d03c720 is described below
commit 130d03c7201807de440c9b2c60e1a9240b920ae9
Author: lihan
AuthorDate: Wed Nov 2 10:09:18 2022 +0800
Fix BZ 66331
Fix a regression in refactoring for Stack on the SystemLogHandler which
caught incorrect exception.
---
java/org/apache/tomcat/util/log/SystemLogHandler.java | 4 ++--
webapps/docs/changelog.xml| 5 +
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/log/SystemLogHandler.java
b/java/org/apache/tomcat/util/log/SystemLogHandler.java
index 2293f349af..946d9d6d9b 100644
--- a/java/org/apache/tomcat/util/log/SystemLogHandler.java
+++ b/java/org/apache/tomcat/util/log/SystemLogHandler.java
@@ -20,7 +20,7 @@ import java.io.IOException;
import java.io.PrintStream;
import java.util.ArrayDeque;
import java.util.Deque;
-import java.util.EmptyStackException;
+import java.util.NoSuchElementException;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -83,7 +83,7 @@ public class SystemLogHandler extends PrintStream {
if (!reuse.isEmpty()) {
try {
log = reuse.remove();
-} catch (EmptyStackException e) {
+} catch (NoSuchElementException e) {
log = new CaptureLog();
}
} else {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 08fbbc26c3..9c6e2a1ff1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -123,6 +123,11 @@
Context was ignored and the default was always used.
(markt)
+
+66331: Fix a regression in refactoring for
Stack
+on the SystemLogHandler which caught incorrect exception.
+(lihan)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: Fix BZ 66330
> 2022年11月2日 10:09，li...@apache.org 写道：
>
> This is an automated email from the ASF dual-hosted git repository.
>
> lihan 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 ee4a1496dd Fix BZ 66330
> ee4a1496dd is described below
>
> commit ee4a1496dd16dfc31142e69527dad496fb28276f
> Author: lihan
> AuthorDate: Wed Nov 2 10:09:18 2022 +0800
>
>Fix BZ 66330
Wrongly written, not 66330 but 66331.
Han
>
>Fix a regression in refactoring for Stack on the SystemLogHandler which
> caught incorrect exception.
> ---
> java/org/apache/tomcat/util/log/SystemLogHandler.java | 4 ++--
> webapps/docs/changelog.xml| 5 +
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/java/org/apache/tomcat/util/log/SystemLogHandler.java
> b/java/org/apache/tomcat/util/log/SystemLogHandler.java
> index 2293f349af..946d9d6d9b 100644
> --- a/java/org/apache/tomcat/util/log/SystemLogHandler.java
> +++ b/java/org/apache/tomcat/util/log/SystemLogHandler.java
> @@ -20,7 +20,7 @@ import java.io.IOException;
> import java.io.PrintStream;
> import java.util.ArrayDeque;
> import java.util.Deque;
> -import java.util.EmptyStackException;
> +import java.util.NoSuchElementException;
> import java.util.Queue;
> import java.util.concurrent.ConcurrentLinkedQueue;
>
> @@ -83,7 +83,7 @@ public class SystemLogHandler extends PrintStream {
> if (!reuse.isEmpty()) {
> try {
> log = reuse.remove();
> -} catch (EmptyStackException e) {
> +} catch (NoSuchElementException e) {
> log = new CaptureLog();
> }
> } else {
> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
> index de46e2c392..319be06fe2 100644
> --- a/webapps/docs/changelog.xml
> +++ b/webapps/docs/changelog.xml
> @@ -131,6 +131,11 @@
> Context was ignored and the default was always used.
> (markt)
>
> +
> +66331: Fix a regression in refactoring for
> Stack
> +on the SystemLogHandler which caught incorrect
> exception.
> +(lihan)
> +
>
>
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix BZ 66330
This is an automated email from the ASF dual-hosted git repository.
lihan 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 ee4a1496dd Fix BZ 66330
ee4a1496dd is described below
commit ee4a1496dd16dfc31142e69527dad496fb28276f
Author: lihan
AuthorDate: Wed Nov 2 10:09:18 2022 +0800
Fix BZ 66330
Fix a regression in refactoring for Stack on the SystemLogHandler which
caught incorrect exception.
---
java/org/apache/tomcat/util/log/SystemLogHandler.java | 4 ++--
webapps/docs/changelog.xml| 5 +
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/log/SystemLogHandler.java
b/java/org/apache/tomcat/util/log/SystemLogHandler.java
index 2293f349af..946d9d6d9b 100644
--- a/java/org/apache/tomcat/util/log/SystemLogHandler.java
+++ b/java/org/apache/tomcat/util/log/SystemLogHandler.java
@@ -20,7 +20,7 @@ import java.io.IOException;
import java.io.PrintStream;
import java.util.ArrayDeque;
import java.util.Deque;
-import java.util.EmptyStackException;
+import java.util.NoSuchElementException;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -83,7 +83,7 @@ public class SystemLogHandler extends PrintStream {
if (!reuse.isEmpty()) {
try {
log = reuse.remove();
-} catch (EmptyStackException e) {
+} catch (NoSuchElementException e) {
log = new CaptureLog();
}
} else {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index de46e2c392..319be06fe2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -131,6 +131,11 @@
Context was ignored and the default was always used.
(markt)
+
+66331: Fix a regression in refactoring for
Stack
+on the SystemLogHandler which caught incorrect exception.
+(lihan)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: November release round
> 2022年11月2日 00:19，Mark Thomas 写道： > > I've just read the OpenSSL announcement. The issue has been downgraded to > critical but we are going to need to new Tomcat Native release. There are a > couple of stack overflow bugs in certificate verification so Tomcat could be > accepted via CLIENT-CERT. > > Where are we on the migration tool. I haven't been following that closely. Is > the repo ready for a release? Yes, I think it’s ready. ;) Han > > Mark > > > On 25/10/2022 16:55, Rémy Maucherat wrote: >> On Tue, Oct 25, 2022 at 5:52 PM Mark Thomas wrote: >>> >>> Hi all, >>> >>> I've just seen the heads up from the OpenSSL project that there will be >>> a 3.0.7 release on 2022-12-01 that will address a critical >>> vulnerability. We won't know the details of the vulnerability until the >>> release announcement. Given that it may trigger a Tomcat Native release >>> my current thinking is: >>> >>> - prep for November releases as normal >>> - review the OpenSSL issue once public >>> - roll a Tomcat Native release if necessary >>> - update to the new Tomcat Native release of there is one >>> - roll the Tomcat releases >>> >>> Do we want to pick up an updated migration tool as well? >> Maybe, we're in the process of integrating a PR for the tool. The >> submitter says it makes it run faster. >> Rémy >>> Mark >>> >>> - >>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >>> For additional commands, e-mail: dev-h...@tomcat.apache.org >>> >> - >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66331] New: Incorrect exception is being caught in SystemLogHandler
https://bz.apache.org/bugzilla/show_bug.cgi?id=66331 Bug ID: 66331 Summary: Incorrect exception is being caught in SystemLogHandler Product: Tomcat 10 Version: 10.0.27 Hardware: Other OS: All Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: jdc0...@gmail.com Target Milestone: -- When the "reuse" was changed from Stack to Queue in 10.0.25, it seems the `catch` around `log.reuse.remove()` in the SystemLogHandler class should have changed to catch a `NoSuchElementException`. The `NoSuchElementException` is the exception that is thrown when a Queue has no elements. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: November release round
I've just read the OpenSSL announcement. The issue has been downgraded to critical but we are going to need to new Tomcat Native release. There are a couple of stack overflow bugs in certificate verification so Tomcat could be accepted via CLIENT-CERT. Where are we on the migration tool. I haven't been following that closely. Is the repo ready for a release? Mark On 25/10/2022 16:55, Rémy Maucherat wrote: On Tue, Oct 25, 2022 at 5:52 PM Mark Thomas wrote: Hi all, I've just seen the heads up from the OpenSSL project that there will be a 3.0.7 release on 2022-12-01 that will address a critical vulnerability. We won't know the details of the vulnerability until the release announcement. Given that it may trigger a Tomcat Native release my current thinking is: - prep for November releases as normal - review the OpenSSL issue once public - roll a Tomcat Native release if necessary - update to the new Tomcat Native release of there is one - roll the Tomcat releases Do we want to pick up an updated migration tool as well? Maybe, we're in the process of integrating a PR for the tool. The submitter says it makes it run faster. Rémy Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - 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: Fix BZ 66330
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 3b4ad6fc54 Fix BZ 66330 3b4ad6fc54 is described below commit 3b4ad6fc547616c666839bbcbdfe68e9dcd1d01a Author: Mark Thomas AuthorDate: Tue Nov 1 12:30:11 2022 + Fix BZ 66330 Correct a regression introduced when fixing bug 62897 that meant any value configured for skipMemoryLeakChecksOnJvmShutdown on the Context was ignored and the default was always used. https://bz.apache.org/bugzilla/show_bug.cgi?id=66330 --- java/org/apache/catalina/core/StandardContext.java | 1 + webapps/docs/changelog.xml | 11 +++ 2 files changed, 12 insertions(+) diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index 4371732fa5..2156995af9 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/core/StandardContext.java @@ -5087,6 +5087,7 @@ public class StandardContext extends ContainerBase cl.setClearReferencesHttpClientKeepAliveThread(getClearReferencesHttpClientKeepAliveThread()); cl.setClearReferencesObjectStreamClassCaches(getClearReferencesObjectStreamClassCaches()); cl.setClearReferencesThreadLocals(getClearReferencesThreadLocals()); + cl.setSkipMemoryLeakChecksOnJvmShutdown(getSkipMemoryLeakChecksOnJvmShutdown()); } // By calling unbindThread and bindThread in a row, we setup the diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index def52a2c8c..bbbd2e97c9 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -105,6 +105,17 @@ issues do not "pop up" wrt. others). --> + + + +66330: Correct a regression introduced when fixing +62897 that meant any value configured for +skipMemoryLeakChecksOnJvmShutdown on the +Context was ignored and the default was always used. +(markt) + + + - 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: Fix BZ 66330
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 076b4b38c8 Fix BZ 66330 076b4b38c8 is described below commit 076b4b38c80929eb3a5cd8df9cdc9f0935711718 Author: Mark Thomas AuthorDate: Tue Nov 1 12:30:11 2022 + Fix BZ 66330 Correct a regression introduced when fixing bug 62897 that meant any value configured for skipMemoryLeakChecksOnJvmShutdown on the Context was ignored and the default was always used. https://bz.apache.org/bugzilla/show_bug.cgi?id=66330 --- java/org/apache/catalina/core/StandardContext.java | 1 + webapps/docs/changelog.xml | 7 +++ 2 files changed, 8 insertions(+) diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index 26639ef22c..3d86ee343f 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/core/StandardContext.java @@ -5087,6 +5087,7 @@ public class StandardContext extends ContainerBase cl.setClearReferencesHttpClientKeepAliveThread(getClearReferencesHttpClientKeepAliveThread()); cl.setClearReferencesObjectStreamClassCaches(getClearReferencesObjectStreamClassCaches()); cl.setClearReferencesThreadLocals(getClearReferencesThreadLocals()); + cl.setSkipMemoryLeakChecksOnJvmShutdown(getSkipMemoryLeakChecksOnJvmShutdown()); } // By calling unbindThread and bindThread in a row, we setup the diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 28105c2e10..c202144015 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -116,6 +116,13 @@ Context to WebResourceRoot. Based on a patch provided by Rahul Jaisimha. (markt) + +66330: Correct a regression introduced when fixing +62897 that meant any value configured for +skipMemoryLeakChecksOnJvmShutdown on the +Context was ignored and the default was always used. +(markt) + - 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: Fix BZ 66330
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 1883de7bba Fix BZ 66330 1883de7bba is described below commit 1883de7bbaf8e3da5c57529a0e8fe88f766d817c Author: Mark Thomas AuthorDate: Tue Nov 1 12:30:11 2022 + Fix BZ 66330 Correct a regression introduced when fixing bug 62897 that meant any value configured for skipMemoryLeakChecksOnJvmShutdown on the Context was ignored and the default was always used. https://bz.apache.org/bugzilla/show_bug.cgi?id=66330 --- java/org/apache/catalina/core/StandardContext.java | 1 + webapps/docs/changelog.xml | 7 +++ 2 files changed, 8 insertions(+) diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index caeb3b2514..2028d76f00 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/core/StandardContext.java @@ -5020,6 +5020,7 @@ public class StandardContext extends ContainerBase cl.setClearReferencesHttpClientKeepAliveThread(getClearReferencesHttpClientKeepAliveThread()); cl.setClearReferencesObjectStreamClassCaches(getClearReferencesObjectStreamClassCaches()); cl.setClearReferencesThreadLocals(getClearReferencesThreadLocals()); + cl.setSkipMemoryLeakChecksOnJvmShutdown(getSkipMemoryLeakChecksOnJvmShutdown()); } // By calling unbindThread and bindThread in a row, we setup the diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 7c3038427e..08fbbc26c3 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -116,6 +116,13 @@ Context to WebResourceRoot. Based on a patch provided by Rahul Jaisimha. (markt) + +66330: Correct a regression introduced when fixing +62897 that meant any value configured for +skipMemoryLeakChecksOnJvmShutdown on the +Context was ignored and the default was always used. +(markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix BZ 66330
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 The following commit(s) were added to refs/heads/main by this push: new e4ea23e295 Fix BZ 66330 e4ea23e295 is described below commit e4ea23e29559f18b587a9b621bba82955db28703 Author: Mark Thomas AuthorDate: Tue Nov 1 12:30:11 2022 + Fix BZ 66330 Correct a regression introduced when fixing bug 62897 that meant any value configured for skipMemoryLeakChecksOnJvmShutdown on the Context was ignored and the default was always used. https://bz.apache.org/bugzilla/show_bug.cgi?id=66330 --- java/org/apache/catalina/core/StandardContext.java | 1 + webapps/docs/changelog.xml | 7 +++ 2 files changed, 8 insertions(+) diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index d21ea4fed5..6a3ba578f0 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/core/StandardContext.java @@ -5002,6 +5002,7 @@ public class StandardContext extends ContainerBase cl.setClearReferencesHttpClientKeepAliveThread(getClearReferencesHttpClientKeepAliveThread()); cl.setClearReferencesObjectStreamClassCaches(getClearReferencesObjectStreamClassCaches()); cl.setClearReferencesThreadLocals(getClearReferencesThreadLocals()); + cl.setSkipMemoryLeakChecksOnJvmShutdown(getSkipMemoryLeakChecksOnJvmShutdown()); } // By calling unbindThread and bindThread in a row, we setup the diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 39722f37c1..de46e2c392 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -124,6 +124,13 @@ Context to WebResourceRoot. Based on a patch provided by Rahul Jaisimha. (markt) + +66330: Correct a regression introduced when fixing +62897 that meant any value configured for +skipMemoryLeakChecksOnJvmShutdown on the +Context was ignored and the default was always used. +(markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66330] StandardContext.skipMemoryLeakChecksOnJvmShutdown has no effect
https://bz.apache.org/bugzilla/show_bug.cgi?id=66330 --- Comment #2 from Mark Thomas --- Confirmed this behaviour is a bug. Original feature added for bug 50175 http://svn.apache.org/viewvc?rev=1831618=rev Feature broken by accident when implementing bug 62897 http://svn.apache.org/viewvc?rev=1846236=rev -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66330] StandardContext.skipMemoryLeakChecksOnJvmShutdown has no effect
https://bz.apache.org/bugzilla/show_bug.cgi?id=66330 --- Comment #1 from Mark Thomas --- Thanks for the report. The root cause analysis looks right to me. I have the patch ready to commit to fix this. I just want to double check the archives to make sure there isn't a good reason for the current behaviour. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66330] New: StandardContext.skipMemoryLeakChecksOnJvmShutdown has no effect
https://bz.apache.org/bugzilla/show_bug.cgi?id=66330 Bug ID: 66330 Summary: StandardContext.skipMemoryLeakChecksOnJvmShutdown has no effect Product: Tomcat 10 Version: 10.1.1 Hardware: All OS: All Status: NEW Severity: minor Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: thomas.steger...@gmail.com Target Milestone: -- If the StandardContext property 'skipMemoryLeakChecksOnJvmShutdown' is set to true, one expects, that the memory leak check done by 'WebappClassLoaderBase. clearReferences' will be skipped. This ist not the case. The cause seems to be the missing mapping of the 'skipMemoryLeakChecksOnJvmShutdown' property from the context to the classLoader ( StandardContext.startInternal()). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66196] HTTP/1 connector doesn't blow-up when HTTP header contains non-ASCII characters
https://bz.apache.org/bugzilla/show_bug.cgi?id=66196 --- Comment #7 from Mark Thomas --- The first approved release with this change was 10.1.0. My current thinking is to allow another 2 to 3 releases before back-porting. -- You are receiving this mail because: You are the assignee for the bug. - 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: Fix typo.
This is an automated email from the ASF dual-hosted git repository.
lihan 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 c07394f7d4 Fix typo.
c07394f7d4 is described below
commit c07394f7d4ec53e55b2e1d4e93d868211274d0fc
Author: lihan
AuthorDate: Tue Nov 1 15:51:11 2022 +0800
Fix typo.
---
java/org/apache/catalina/core/ApplicationDispatcher.java | 2 +-
java/org/apache/catalina/core/StandardHostValve.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index 7a7d5abcb2..443c65ce3f 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -336,7 +336,7 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
State state = new State(request, response, false);
if (WRAP_SAME_OBJECT) {
-// Check SRV.9.2 / RequestDispacther Javadoc
+// Check SRV.9.2 / RequestDispatcher Javadoc
checkSameObjects(request, response);
}
diff --git a/java/org/apache/catalina/core/StandardHostValve.java
b/java/org/apache/catalina/core/StandardHostValve.java
index f730d7c035..0383d592b5 100644
--- a/java/org/apache/catalina/core/StandardHostValve.java
+++ b/java/org/apache/catalina/core/StandardHostValve.java
@@ -128,7 +128,7 @@ final class StandardHostValve extends ValveBase {
// Ask this Context to process this request. Requests that are
// already in error must have been routed here to check for
-// application defined error pages so DO NOT forward them to the
the
+// application defined error pages so DO NOT forward them to the
// application for processing.
try {
if (!response.isErrorReportRequired()) {
-
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: Fix typo.
This is an automated email from the ASF dual-hosted git repository.
lihan 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 762b4d3218 Fix typo.
762b4d3218 is described below
commit 762b4d3218ecb0f1b1c85992c5bac58ccaf851e7
Author: lihan
AuthorDate: Tue Nov 1 15:51:11 2022 +0800
Fix typo.
---
java/org/apache/catalina/core/ApplicationDispatcher.java | 2 +-
java/org/apache/catalina/core/StandardHostValve.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index 58ed43b75a..d928ae253c 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -333,7 +333,7 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
State state = new State(request, response, false);
if (WRAP_SAME_OBJECT) {
-// Check SRV.9.2 / RequestDispacther Javadoc
+// Check SRV.9.2 / RequestDispatcher Javadoc
checkSameObjects(request, response);
}
diff --git a/java/org/apache/catalina/core/StandardHostValve.java
b/java/org/apache/catalina/core/StandardHostValve.java
index f730d7c035..0383d592b5 100644
--- a/java/org/apache/catalina/core/StandardHostValve.java
+++ b/java/org/apache/catalina/core/StandardHostValve.java
@@ -128,7 +128,7 @@ final class StandardHostValve extends ValveBase {
// Ask this Context to process this request. Requests that are
// already in error must have been routed here to check for
-// application defined error pages so DO NOT forward them to the
the
+// application defined error pages so DO NOT forward them to the
// application for processing.
try {
if (!response.isErrorReportRequired()) {
-
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: Fix typo.
This is an automated email from the ASF dual-hosted git repository.
lihan 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 2ab219be7d Fix typo.
2ab219be7d is described below
commit 2ab219be7d7dad4b46535441139262281a1152db
Author: lihan
AuthorDate: Tue Nov 1 15:51:11 2022 +0800
Fix typo.
---
java/org/apache/catalina/core/ApplicationDispatcher.java | 2 +-
java/org/apache/catalina/core/StandardHostValve.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index f54ea6f13c..99516c51a2 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -315,7 +315,7 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
State state = new State(request, response, false);
if (context.getDispatcherWrapsSameObject()) {
-// Check SRV.9.2 / RequestDispacther Javadoc
+// Check SRV.9.2 / RequestDispatcher Javadoc
checkSameObjects(request, response);
}
diff --git a/java/org/apache/catalina/core/StandardHostValve.java
b/java/org/apache/catalina/core/StandardHostValve.java
index 2c7004ecdc..76c4171f34 100644
--- a/java/org/apache/catalina/core/StandardHostValve.java
+++ b/java/org/apache/catalina/core/StandardHostValve.java
@@ -112,7 +112,7 @@ final class StandardHostValve extends ValveBase {
// Ask this Context to process this request. Requests that are
// already in error must have been routed here to check for
-// application defined error pages so DO NOT forward them to the
the
+// application defined error pages so DO NOT forward them to the
// application for processing.
try {
if (!response.isErrorReportRequired()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typo.
This is an automated email from the ASF dual-hosted git repository.
lihan 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 9d91e13654 Fix typo.
9d91e13654 is described below
commit 9d91e13654b830a28ac99c44ff5607e507cd43d6
Author: lihan
AuthorDate: Tue Nov 1 15:51:11 2022 +0800
Fix typo.
---
java/org/apache/catalina/core/ApplicationDispatcher.java | 2 +-
java/org/apache/catalina/core/StandardHostValve.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index f54ea6f13c..99516c51a2 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -315,7 +315,7 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
State state = new State(request, response, false);
if (context.getDispatcherWrapsSameObject()) {
-// Check SRV.9.2 / RequestDispacther Javadoc
+// Check SRV.9.2 / RequestDispatcher Javadoc
checkSameObjects(request, response);
}
diff --git a/java/org/apache/catalina/core/StandardHostValve.java
b/java/org/apache/catalina/core/StandardHostValve.java
index 2c7004ecdc..76c4171f34 100644
--- a/java/org/apache/catalina/core/StandardHostValve.java
+++ b/java/org/apache/catalina/core/StandardHostValve.java
@@ -112,7 +112,7 @@ final class StandardHostValve extends ValveBase {
// Ask this Context to process this request. Requests that are
// already in error must have been routed here to check for
-// application defined error pages so DO NOT forward them to the
the
+// application defined error pages so DO NOT forward them to the
// application for processing.
try {
if (!response.isErrorReportRequired()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
