buildbot success in on tomcat-85-trunk
The Buildbot has detected a restored build on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2475 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 570842358a1832f02039bbd361b12a0615f31cb5 Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - 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 (7d497f6 -> 5708423)
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 7d497f6 Update changelog new 0de987e space police new 5708423 Refactor for Java 7 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/javax/el/ELContext.java | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: space police
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 0de987ea2eafd075aaf150c4a47a670ad1ee25be
Author: Mark Thomas
AuthorDate: Thu Sep 17 20:28:44 2020 +0100
space police
---
java/javax/el/ELContext.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/javax/el/ELContext.java b/java/javax/el/ELContext.java
index ca184ca..58c5db5 100644
--- a/java/javax/el/ELContext.java
+++ b/java/javax/el/ELContext.java
@@ -194,7 +194,7 @@ public abstract class ELContext {
if (listeners == null) {
return;
}
-
+
for (EvaluationListener listener : listeners) {
try {
listener.afterEvaluation(this, expression);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Refactor for Java 7
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 570842358a1832f02039bbd361b12a0615f31cb5
Author: Mark Thomas
AuthorDate: Thu Sep 17 20:36:56 2020 +0100
Refactor for Java 7
---
java/javax/el/ELContext.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/javax/el/ELContext.java b/java/javax/el/ELContext.java
index 58c5db5..d33d8b3 100644
--- a/java/javax/el/ELContext.java
+++ b/java/javax/el/ELContext.java
@@ -158,7 +158,11 @@ public abstract class ELContext {
* @since EL 3.0
*/
public List getEvaluationListeners() {
-return listeners == null ? Collections.emptyList() : listeners;
+if (listeners == null) {
+return Collections.emptyList();
+} else {
+return listeners;
+}
}
/**
-
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: space police
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 175a00b space police
175a00b is described below
commit 175a00b7b101ce58009740b80f13397c829bed00
Author: Mark Thomas
AuthorDate: Thu Sep 17 20:28:44 2020 +0100
space police
---
java/javax/el/ELContext.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/javax/el/ELContext.java b/java/javax/el/ELContext.java
index ca184ca..58c5db5 100644
--- a/java/javax/el/ELContext.java
+++ b/java/javax/el/ELContext.java
@@ -194,7 +194,7 @@ public abstract class ELContext {
if (listeners == null) {
return;
}
-
+
for (EvaluationListener listener : listeners) {
try {
listener.afterEvaluation(this, expression);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: space police
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 798d10f space police
798d10f is described below
commit 798d10f5283a8f4bdfd5e051ce02b453e9c128f5
Author: Mark Thomas
AuthorDate: Thu Sep 17 20:28:44 2020 +0100
space police
---
java/jakarta/el/ELContext.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/jakarta/el/ELContext.java b/java/jakarta/el/ELContext.java
index c6d3878..c58037a 100644
--- a/java/jakarta/el/ELContext.java
+++ b/java/jakarta/el/ELContext.java
@@ -191,7 +191,7 @@ public abstract class ELContext {
if (listeners == null) {
return;
}
-
+
for (EvaluationListener listener : listeners) {
try {
listener.afterEvaluation(this, expression);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-85-trunk
The Buildbot has detected a new failure on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2474 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 7d497f652f4c994252796c2bb2976a49012735ab Blamelist: Mark Thomas ,Nikolay Gribanov ,Thomas Andraschko ,Yang Yang BUILD FAILED: failed compile Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #366: Change exception from Throwable to IOException for ServerInfo.java
markt-asf commented on pull request #366: URL: https://github.com/apache/tomcat/pull/366#issuecomment-694437671 That code is deliberately defensive. I can see the possibility for at least `IllegalArgumentException` and possibly `NullPointerException` (I haven't checked in the JRE source to be sure of that one). This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #366: Change exception from Throwable to IOException for ServerInfo.java
markt-asf closed pull request #366: URL: https://github.com/apache/tomcat/pull/366 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Update changelog
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/7.0.x by this push: new 0d40c58 Update changelog 0d40c58 is described below commit 0d40c58a725ce39942aca76fa5bad722d10f258a Author: Mark Thomas AuthorDate: Thu Sep 17 19:53:54 2020 +0100 Update changelog --- webapps/docs/changelog.xml | 8 1 file changed, 8 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 0d99e7f..4b41a9d 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -74,6 +74,14 @@ When building, only rebuild JAR files if the contents has changed. (markt) + +Improvements to Chinese translations. Pull request provided by Yang +Yang. (markt) + + +Expand coverage of Russian translations. Pull request provided by +Nikolay Gribanov. (markt) + - 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: Update changelog
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 7d497f6 Update changelog 7d497f6 is described below commit 7d497f652f4c994252796c2bb2976a49012735ab Author: Mark Thomas AuthorDate: Thu Sep 17 19:53:54 2020 +0100 Update changelog --- webapps/docs/changelog.xml | 17 + 1 file changed, 17 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 861d8fc..36eda75 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -74,6 +74,15 @@ + + + +Use lazy instantiation to improve the performance when working with +listeners added to the ELContext. Pull request provided by +Thomas Andraschko. (markt) + + + @@ -96,6 +105,14 @@ When building, only rebuild JAR files if the contents has changed. (markt) + +Improvements to Chinese translations. Pull request provided by Yang +Yang. (markt) + + +Expand coverage of Russian translations. Pull request provided by +Nikolay Gribanov. (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: Update changelog
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 d06b676 Update changelog d06b676 is described below commit d06b676452d4fb65088a01c59cc0704fafdf66d9 Author: Mark Thomas AuthorDate: Thu Sep 17 19:53:54 2020 +0100 Update changelog --- webapps/docs/changelog.xml | 17 + 1 file changed, 17 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index d6a3589..4ef3656 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -81,6 +81,15 @@ + + + +Use lazy instantiation to improve the performance when working with +listeners added to the ELContext. Pull request provided by +Thomas Andraschko. (markt) + + + @@ -103,6 +112,14 @@ When building, only rebuild JAR files (including OSGi and JPMS metadata) if the contents has changed. (markt) + +Improvements to Chinese translations. Pull request provided by Yang +Yang. (markt) + + +Expand coverage of Russian translations. Pull request provided by +Nikolay Gribanov. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Update changelog
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new 564ab41 Update changelog 564ab41 is described below commit 564ab41f167f35a9a8c04903f865049b50f6b3f3 Author: Mark Thomas AuthorDate: Thu Sep 17 19:53:54 2020 +0100 Update changelog --- webapps/docs/changelog.xml | 17 + 1 file changed, 17 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 3076f9b..5ed18f9 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -81,6 +81,15 @@ + + + +Use lazy instantiation to improve the performance when working with +listeners added to the ELContext. Pull request provided by +Thomas Andraschko. (markt) + + + @@ -103,6 +112,14 @@ When building, only rebuild JAR files (including OSGi and JPMS metadata) if the contents has changed. (markt) + +Improvements to Chinese translations. Pull request provided by Yang +Yang. (markt) + + +Expand coverage of Russian translations. Pull request provided by +Nikolay Gribanov. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] nicholasgribanov opened a new pull request #366: Change exception from Throwable to IOException for ServerInfo.java
nicholasgribanov opened a new pull request #366: URL: https://github.com/apache/tomcat/pull/366 In this section may produce only IOException. Is not necessarily use Throwable there are. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.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: Lazy init ELContext#listeners to avoid unnecessary ArrayList and ArrayList$Itr instances
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 f71875c Lazy init ELContext#listeners to avoid unnecessary ArrayList
and ArrayList$Itr instances
f71875c is described below
commit f71875cd77e79b35872a854c7d6c509e7fdfda72
Author: Thomas Andraschko
AuthorDate: Wed Sep 9 11:15:01 2020 +0200
Lazy init ELContext#listeners to avoid unnecessary ArrayList and
ArrayList$Itr instances
---
java/javax/el/ELContext.java | 20 ++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/java/javax/el/ELContext.java b/java/javax/el/ELContext.java
index cd68a78..ca184ca 100644
--- a/java/javax/el/ELContext.java
+++ b/java/javax/el/ELContext.java
@@ -36,7 +36,7 @@ public abstract class ELContext {
private ImportHandler importHandler = null;
-private List listeners = new ArrayList<>();
+private List listeners;
private Deque> lambdaArguments = new LinkedList<>();
@@ -143,6 +143,10 @@ public abstract class ELContext {
* @since EL 3.0
*/
public void addEvaluationListener(EvaluationListener listener) {
+if (listeners == null) {
+listeners = new ArrayList<>();
+}
+
listeners.add(listener);
}
@@ -154,7 +158,7 @@ public abstract class ELContext {
* @since EL 3.0
*/
public List getEvaluationListeners() {
-return listeners;
+return listeners == null ? Collections.emptyList() : listeners;
}
/**
@@ -165,6 +169,10 @@ public abstract class ELContext {
* @since EL 3.0
*/
public void notifyBeforeEvaluation(String expression) {
+if (listeners == null) {
+return;
+}
+
for (EvaluationListener listener : listeners) {
try {
listener.beforeEvaluation(this, expression);
@@ -183,6 +191,10 @@ public abstract class ELContext {
* @since EL 3.0
*/
public void notifyAfterEvaluation(String expression) {
+if (listeners == null) {
+return;
+}
+
for (EvaluationListener listener : listeners) {
try {
listener.afterEvaluation(this, expression);
@@ -202,6 +214,10 @@ public abstract class ELContext {
* @since EL 3.0
*/
public void notifyPropertyResolved(Object base, Object property) {
+if (listeners == null) {
+return;
+}
+
for (EvaluationListener listener : listeners) {
try {
listener.propertyResolved(this, base, property);
-
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: Lazy init ELContext#listeners to avoid unnecessary ArrayList and ArrayList$Itr instances
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 ad4080d Lazy init ELContext#listeners to avoid unnecessary ArrayList
and ArrayList$Itr instances
ad4080d is described below
commit ad4080dbed63b71f8e2b1a5779fdea0876d2556b
Author: Thomas Andraschko
AuthorDate: Wed Sep 9 11:15:01 2020 +0200
Lazy init ELContext#listeners to avoid unnecessary ArrayList and
ArrayList$Itr instances
---
java/javax/el/ELContext.java | 20 ++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/java/javax/el/ELContext.java b/java/javax/el/ELContext.java
index cd68a78..ca184ca 100644
--- a/java/javax/el/ELContext.java
+++ b/java/javax/el/ELContext.java
@@ -36,7 +36,7 @@ public abstract class ELContext {
private ImportHandler importHandler = null;
-private List listeners = new ArrayList<>();
+private List listeners;
private Deque> lambdaArguments = new LinkedList<>();
@@ -143,6 +143,10 @@ public abstract class ELContext {
* @since EL 3.0
*/
public void addEvaluationListener(EvaluationListener listener) {
+if (listeners == null) {
+listeners = new ArrayList<>();
+}
+
listeners.add(listener);
}
@@ -154,7 +158,7 @@ public abstract class ELContext {
* @since EL 3.0
*/
public List getEvaluationListeners() {
-return listeners;
+return listeners == null ? Collections.emptyList() : listeners;
}
/**
@@ -165,6 +169,10 @@ public abstract class ELContext {
* @since EL 3.0
*/
public void notifyBeforeEvaluation(String expression) {
+if (listeners == null) {
+return;
+}
+
for (EvaluationListener listener : listeners) {
try {
listener.beforeEvaluation(this, expression);
@@ -183,6 +191,10 @@ public abstract class ELContext {
* @since EL 3.0
*/
public void notifyAfterEvaluation(String expression) {
+if (listeners == null) {
+return;
+}
+
for (EvaluationListener listener : listeners) {
try {
listener.afterEvaluation(this, expression);
@@ -202,6 +214,10 @@ public abstract class ELContext {
* @since EL 3.0
*/
public void notifyPropertyResolved(Object base, Object property) {
+if (listeners == null) {
+return;
+}
+
for (EvaluationListener listener : listeners) {
try {
listener.propertyResolved(this, base, property);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] nicholasgribanov commented on pull request #365: Added Russian LocalStrings_ru.properties for standardWrapper
nicholasgribanov commented on pull request #365: URL: https://github.com/apache/tomcat/pull/365#issuecomment-694428460 Thanks! This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.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: Missing import
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 3e279ea Missing import 3e279ea is described below commit 3e279eae309e62f49780de276389d92f54b8e303 Author: Thomas Andraschko AuthorDate: Wed Sep 9 11:21:31 2020 +0200 Missing import --- java/javax/el/ELContext.java | 1 + 1 file changed, 1 insertion(+) diff --git a/java/javax/el/ELContext.java b/java/javax/el/ELContext.java index 46f0564..cd68a78 100644 --- a/java/javax/el/ELContext.java +++ b/java/javax/el/ELContext.java @@ -17,6 +17,7 @@ package javax.el; import java.util.ArrayList; +import java.util.Collections; import java.util.Deque; import java.util.HashMap; import java.util.LinkedList; - 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: Missing import
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 2966c2b Missing import 2966c2b is described below commit 2966c2ba9430d8ec7b8786182c5256657a926c60 Author: Thomas Andraschko AuthorDate: Wed Sep 9 11:21:31 2020 +0200 Missing import --- java/javax/el/ELContext.java | 1 + 1 file changed, 1 insertion(+) diff --git a/java/javax/el/ELContext.java b/java/javax/el/ELContext.java index 46f0564..cd68a78 100644 --- a/java/javax/el/ELContext.java +++ b/java/javax/el/ELContext.java @@ -17,6 +17,7 @@ package javax.el; import java.util.ArrayList; +import java.util.Collections; import java.util.Deque; import java.util.HashMap; import java.util.LinkedList; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (8689d64 -> aded044)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 8689d64 Export / Import to fix order new a4fbb70 Lazy init ELContext#listeners to avoid unnecessary ArrayList and ArrayList$Itr instances new aded044 Missing import 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/jakarta/el/ELContext.java | 21 +++-- 1 file changed, 19 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Lazy init ELContext#listeners to avoid unnecessary ArrayList and ArrayList$Itr instances
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a4fbb7041861878c76469a7bc91c77e72331e208
Author: Thomas Andraschko
AuthorDate: Wed Sep 9 11:15:01 2020 +0200
Lazy init ELContext#listeners to avoid unnecessary ArrayList and
ArrayList$Itr instances
---
java/jakarta/el/ELContext.java | 20 ++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/java/jakarta/el/ELContext.java b/java/jakarta/el/ELContext.java
index 8f622b1..367d7a9 100644
--- a/java/jakarta/el/ELContext.java
+++ b/java/jakarta/el/ELContext.java
@@ -35,7 +35,7 @@ public abstract class ELContext {
private ImportHandler importHandler = null;
-private List listeners = new ArrayList<>();
+private List listeners;
private Deque> lambdaArguments = new LinkedList<>();
@@ -139,6 +139,10 @@ public abstract class ELContext {
* @since EL 3.0
*/
public void addEvaluationListener(EvaluationListener listener) {
+if (listeners == null) {
+listeners = new ArrayList<>();
+}
+
listeners.add(listener);
}
@@ -150,7 +154,7 @@ public abstract class ELContext {
* @since EL 3.0
*/
public List getEvaluationListeners() {
-return listeners;
+return listeners == null ? Collections.emptyList() : listeners;
}
/**
@@ -161,6 +165,10 @@ public abstract class ELContext {
* @since EL 3.0
*/
public void notifyBeforeEvaluation(String expression) {
+if (listeners == null) {
+return;
+}
+
for (EvaluationListener listener : listeners) {
try {
listener.beforeEvaluation(this, expression);
@@ -179,6 +187,10 @@ public abstract class ELContext {
* @since EL 3.0
*/
public void notifyAfterEvaluation(String expression) {
+if (listeners == null) {
+return;
+}
+
for (EvaluationListener listener : listeners) {
try {
listener.afterEvaluation(this, expression);
@@ -198,6 +210,10 @@ public abstract class ELContext {
* @since EL 3.0
*/
public void notifyPropertyResolved(Object base, Object property) {
+if (listeners == null) {
+return;
+}
+
for (EvaluationListener listener : listeners) {
try {
listener.propertyResolved(this, base, property);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Missing import
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git commit aded044ff5953fdbce2df3acf4af62cd1454edc2 Author: Thomas Andraschko AuthorDate: Wed Sep 9 11:21:31 2020 +0200 Missing import --- java/jakarta/el/ELContext.java | 1 + 1 file changed, 1 insertion(+) diff --git a/java/jakarta/el/ELContext.java b/java/jakarta/el/ELContext.java index 367d7a9..c6d3878 100644 --- a/java/jakarta/el/ELContext.java +++ b/java/jakarta/el/ELContext.java @@ -17,6 +17,7 @@ package jakarta.el; import java.util.ArrayList; +import java.util.Collections; import java.util.Deque; import java.util.HashMap; import java.util.LinkedList; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf merged pull request #355: [perf] Lazy init ELContext#listeners to avoid unnecessary ArrayList and ArrayList$Itr
markt-asf merged pull request #355: URL: https://github.com/apache/tomcat/pull/355 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.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: Added russian LocalStrings_ru.properties for standardWrapper
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 b066b9b Added russian LocalStrings_ru.properties for standardWrapper
b066b9b is described below
commit b066b9b3b1ab5db63a137e3f83749e87e0d15f5b
Author: Nikolay Gribanov
AuthorDate: Wed Sep 16 21:40:31 2020 +0300
Added russian LocalStrings_ru.properties for standardWrapper
---
.../apache/catalina/core/LocalStrings_ru.properties | 19 +++
1 file changed, 19 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_ru.properties
b/java/org/apache/catalina/core/LocalStrings_ru.properties
index 2bb9746..6759ce9 100644
--- a/java/org/apache/catalina/core/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ru.properties
@@ -17,4 +17,23 @@ applicationContext.addJspFile.iae=Файл JSP [{0}] содержит
ошибк
applicationContext.addListener.iae.cnfe=Невозможно создать экземпляр типа [{0}]
applicationContext.setAttribute.namenull=Имя не может быть пустым
+standardWrapper.allocate=Ошибка при выделении экземпляра сервлета
+standardWrapper.allocateException=Ошибка выделения для сервлета [{0}]
+standardWrapper.deallocateException=Ошибка освобождения для сервлета [{0}]
+standardWrapper.destroyException=Servlet.destroy() для сервлета [{0}] выбросил
исключение
+standardWrapper.destroyInstance=InstanceManager.destroy() для сервлета [{0}]
выбросил исключение
+standardWrapper.initException=Servlet.init() для сервлета [{0}] выбросил
исключение
+standardWrapper.instantiate=Ошибка создания экземпляра класса сервлета [{0}]
standardWrapper.isUnavailable=Сервлет [{0}] временно недоступен
+standardWrapper.jspMonitorError=Ошибка регистрации JSP-монитора Mbean [{0}]
+standardWrapper.notChild=Контейнер может не иметь дочерних контейнеров
+standardWrapper.notClass=Для сервлета [{0}] не указан специальный класс
+standardWrapper.notContext=Родительский контейнер обертки должен быть
контекстом
+standardWrapper.notFound=Сервлет [{0}] недоступен
+standardWrapper.notServlet=Класс [{0}] не является сервлетом
+standardWrapper.serviceException=Servlet.service() для сервлета [{0}] в
контексте с путем [{1}] выбросил исключение
+standardWrapper.serviceExceptionRoot=Servlet.service() для сервлета [{0}] в
контексте с путем [{1}] выбросил исключение [{2}] с первопричиной
+standardWrapper.unavailable=Выделенный сервлет [{0}] недоступен
+standardWrapper.unloadException=Сервлет [{0}] выбросил исключение unload()
+standardWrapper.unloading=Невозможно выделить сервлет [{0}] потому что он еще
заугружается
+standardWrapper.waiting=Ожидание для [{0}] экземпляра(ов) которые нужно
освободить для сервлета [{1}]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Added russian LocalStrings_ru.properties for standardWrapper
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new b568e19 Added russian LocalStrings_ru.properties for standardWrapper
b568e19 is described below
commit b568e19281d11fea7e8f1d3659d00eb7dde7a094
Author: Nikolay Gribanov
AuthorDate: Wed Sep 16 21:40:31 2020 +0300
Added russian LocalStrings_ru.properties for standardWrapper
---
.../apache/catalina/core/LocalStrings_ru.properties | 19 +++
1 file changed, 19 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_ru.properties
b/java/org/apache/catalina/core/LocalStrings_ru.properties
index 14414b4..9192eb9 100644
--- a/java/org/apache/catalina/core/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ru.properties
@@ -16,4 +16,23 @@
applicationContext.addListener.iae.cnfe=Невозможно создать экземпляр типа [{0}]
applicationContext.setAttribute.namenull=Имя не может быть пустым
+standardWrapper.allocate=Ошибка при выделении экземпляра сервлета
+standardWrapper.allocateException=Ошибка выделения для сервлета [{0}]
+standardWrapper.deallocateException=Ошибка освобождения для сервлета [{0}]
+standardWrapper.destroyException=Servlet.destroy() для сервлета [{0}] выбросил
исключение
+standardWrapper.destroyInstance=InstanceManager.destroy() для сервлета [{0}]
выбросил исключение
+standardWrapper.initException=Servlet.init() для сервлета [{0}] выбросил
исключение
+standardWrapper.instantiate=Ошибка создания экземпляра класса сервлета [{0}]
standardWrapper.isUnavailable=Сервлет [{0}] временно недоступен
+standardWrapper.jspMonitorError=Ошибка регистрации JSP-монитора Mbean [{0}]
+standardWrapper.notChild=Контейнер может не иметь дочерних контейнеров
+standardWrapper.notClass=Для сервлета [{0}] не указан специальный класс
+standardWrapper.notContext=Родительский контейнер обертки должен быть
контекстом
+standardWrapper.notFound=Сервлет [{0}] недоступен
+standardWrapper.notServlet=Класс [{0}] не является сервлетом
+standardWrapper.serviceException=Servlet.service() для сервлета [{0}] в
контексте с путем [{1}] выбросил исключение
+standardWrapper.serviceExceptionRoot=Servlet.service() для сервлета [{0}] в
контексте с путем [{1}] выбросил исключение [{2}] с первопричиной
+standardWrapper.unavailable=Выделенный сервлет [{0}] недоступен
+standardWrapper.unloadException=Сервлет [{0}] выбросил исключение unload()
+standardWrapper.unloading=Невозможно выделить сервлет [{0}] потому что он еще
заугружается
+standardWrapper.waiting=Ожидание для [{0}] экземпляра(ов) которые нужно
освободить для сервлета [{1}]
-
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: Added russian LocalStrings_ru.properties for standardWrapper
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 91e8e59 Added russian LocalStrings_ru.properties for standardWrapper
91e8e59 is described below
commit 91e8e59c618052e620cfcc1112c3daae073ca92a
Author: Nikolay Gribanov
AuthorDate: Wed Sep 16 21:40:31 2020 +0300
Added russian LocalStrings_ru.properties for standardWrapper
---
.../apache/catalina/core/LocalStrings_ru.properties | 19 +++
1 file changed, 19 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_ru.properties
b/java/org/apache/catalina/core/LocalStrings_ru.properties
index 2bb9746..6759ce9 100644
--- a/java/org/apache/catalina/core/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ru.properties
@@ -17,4 +17,23 @@ applicationContext.addJspFile.iae=Файл JSP [{0}] содержит
ошибк
applicationContext.addListener.iae.cnfe=Невозможно создать экземпляр типа [{0}]
applicationContext.setAttribute.namenull=Имя не может быть пустым
+standardWrapper.allocate=Ошибка при выделении экземпляра сервлета
+standardWrapper.allocateException=Ошибка выделения для сервлета [{0}]
+standardWrapper.deallocateException=Ошибка освобождения для сервлета [{0}]
+standardWrapper.destroyException=Servlet.destroy() для сервлета [{0}] выбросил
исключение
+standardWrapper.destroyInstance=InstanceManager.destroy() для сервлета [{0}]
выбросил исключение
+standardWrapper.initException=Servlet.init() для сервлета [{0}] выбросил
исключение
+standardWrapper.instantiate=Ошибка создания экземпляра класса сервлета [{0}]
standardWrapper.isUnavailable=Сервлет [{0}] временно недоступен
+standardWrapper.jspMonitorError=Ошибка регистрации JSP-монитора Mbean [{0}]
+standardWrapper.notChild=Контейнер может не иметь дочерних контейнеров
+standardWrapper.notClass=Для сервлета [{0}] не указан специальный класс
+standardWrapper.notContext=Родительский контейнер обертки должен быть
контекстом
+standardWrapper.notFound=Сервлет [{0}] недоступен
+standardWrapper.notServlet=Класс [{0}] не является сервлетом
+standardWrapper.serviceException=Servlet.service() для сервлета [{0}] в
контексте с путем [{1}] выбросил исключение
+standardWrapper.serviceExceptionRoot=Servlet.service() для сервлета [{0}] в
контексте с путем [{1}] выбросил исключение [{2}] с первопричиной
+standardWrapper.unavailable=Выделенный сервлет [{0}] недоступен
+standardWrapper.unloadException=Сервлет [{0}] выбросил исключение unload()
+standardWrapper.unloading=Невозможно выделить сервлет [{0}] потому что он еще
заугружается
+standardWrapper.waiting=Ожидание для [{0}] экземпляра(ов) которые нужно
освободить для сервлета [{1}]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Export / Import to fix order
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 8689d64 Export / Import to fix order
8689d64 is described below
commit 8689d64603c0267170dd547fc9d08b728cc4fbd2
Author: Mark Thomas
AuthorDate: Thu Sep 17 19:35:53 2020 +0100
Export / Import to fix order
---
java/org/apache/catalina/core/LocalStrings_ru.properties | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_ru.properties
b/java/org/apache/catalina/core/LocalStrings_ru.properties
index 1578eb9..6759ce9 100644
--- a/java/org/apache/catalina/core/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ru.properties
@@ -17,8 +17,6 @@ applicationContext.addJspFile.iae=Файл JSP [{0}] содержит
ошибк
applicationContext.addListener.iae.cnfe=Невозможно создать экземпляр типа [{0}]
applicationContext.setAttribute.namenull=Имя не может быть пустым
-standardWrapper.isUnavailable=Сервлет [{0}] временно недоступен
-
standardWrapper.allocate=Ошибка при выделении экземпляра сервлета
standardWrapper.allocateException=Ошибка выделения для сервлета [{0}]
standardWrapper.deallocateException=Ошибка освобождения для сервлета [{0}]
@@ -26,6 +24,7 @@ standardWrapper.destroyException=Servlet.destroy() для
сервлета [{0}]
standardWrapper.destroyInstance=InstanceManager.destroy() для сервлета [{0}]
выбросил исключение
standardWrapper.initException=Servlet.init() для сервлета [{0}] выбросил
исключение
standardWrapper.instantiate=Ошибка создания экземпляра класса сервлета [{0}]
+standardWrapper.isUnavailable=Сервлет [{0}] временно недоступен
standardWrapper.jspMonitorError=Ошибка регистрации JSP-монитора Mbean [{0}]
standardWrapper.notChild=Контейнер может не иметь дочерних контейнеров
standardWrapper.notClass=Для сервлета [{0}] не указан специальный класс
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #365: Added Russian LocalStrings_ru.properties for standardWrapper
markt-asf commented on pull request #365: URL: https://github.com/apache/tomcat/pull/365#issuecomment-694421738 Thanks. Merged. Please note that our preferred route for translation updates is: https://poeditor.com/projects/view?id=221603 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Added russian LocalStrings_ru.properties for standardWrapper
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new ce2a55d Added russian LocalStrings_ru.properties for standardWrapper
ce2a55d is described below
commit ce2a55d450a875e5323fc2af7f0b4662217bf344
Author: Nikolay Gribanov
AuthorDate: Wed Sep 16 21:40:31 2020 +0300
Added russian LocalStrings_ru.properties for standardWrapper
---
.../apache/catalina/core/LocalStrings_ru.properties | 20
1 file changed, 20 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_ru.properties
b/java/org/apache/catalina/core/LocalStrings_ru.properties
index 2bb9746..1578eb9 100644
--- a/java/org/apache/catalina/core/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ru.properties
@@ -18,3 +18,23 @@ applicationContext.addListener.iae.cnfe=Невозможно создать эк
applicationContext.setAttribute.namenull=Имя не может быть пустым
standardWrapper.isUnavailable=Сервлет [{0}] временно недоступен
+
+standardWrapper.allocate=Ошибка при выделении экземпляра сервлета
+standardWrapper.allocateException=Ошибка выделения для сервлета [{0}]
+standardWrapper.deallocateException=Ошибка освобождения для сервлета [{0}]
+standardWrapper.destroyException=Servlet.destroy() для сервлета [{0}] выбросил
исключение
+standardWrapper.destroyInstance=InstanceManager.destroy() для сервлета [{0}]
выбросил исключение
+standardWrapper.initException=Servlet.init() для сервлета [{0}] выбросил
исключение
+standardWrapper.instantiate=Ошибка создания экземпляра класса сервлета [{0}]
+standardWrapper.jspMonitorError=Ошибка регистрации JSP-монитора Mbean [{0}]
+standardWrapper.notChild=Контейнер может не иметь дочерних контейнеров
+standardWrapper.notClass=Для сервлета [{0}] не указан специальный класс
+standardWrapper.notContext=Родительский контейнер обертки должен быть
контекстом
+standardWrapper.notFound=Сервлет [{0}] недоступен
+standardWrapper.notServlet=Класс [{0}] не является сервлетом
+standardWrapper.serviceException=Servlet.service() для сервлета [{0}] в
контексте с путем [{1}] выбросил исключение
+standardWrapper.serviceExceptionRoot=Servlet.service() для сервлета [{0}] в
контексте с путем [{1}] выбросил исключение [{2}] с первопричиной
+standardWrapper.unavailable=Выделенный сервлет [{0}] недоступен
+standardWrapper.unloadException=Сервлет [{0}] выбросил исключение unload()
+standardWrapper.unloading=Невозможно выделить сервлет [{0}] потому что он еще
заугружается
+standardWrapper.waiting=Ожидание для [{0}] экземпляра(ов) которые нужно
освободить для сервлета [{1}]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf merged pull request #365: Added Russian LocalStrings_ru.properties for standardWrapper
markt-asf merged pull request #365: URL: https://github.com/apache/tomcat/pull/365 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Fix Chinese translation of word "war"
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 99a8560 Fix Chinese translation of word "war"
99a8560 is described below
commit 99a856009bb95113267341692e64d3ca7930d77b
Author: Yang Yang
AuthorDate: Mon Sep 14 18:50:33 2020 +0800
Fix Chinese translation of word "war"
---
java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties | 4 ++--
java/org/apache/catalina/startup/LocalStrings_zh_CN.properties | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
index cd87218..359d52c 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
@@ -23,7 +23,7 @@ farmWarDeployer.mbeanNameFail=无法为引擎[{0}]和主机[{1}]构造MBean对
farmWarDeployer.modInstall=从 [{1}] 安装 webapp [{0}]
farmWarDeployer.modInstallFail=无法安装 WAR 文件
farmWarDeployer.msgIoe=无法读取服务器场部署文件消息。
-farmWarDeployer.msgRxDeploy=接收集群部署路径[{0}]，战争[{1}]
+farmWarDeployer.msgRxDeploy=接收集群部署路径[{0}]，war[{1}]
farmWarDeployer.msgRxUndeploy=从路径[{0}]接收未部署群集
farmWarDeployer.removeFailLocal=从[{0}]本地移除失败
farmWarDeployer.removeFailRemote=本地从[{0}]删除失败，其他经理有app在服务！
@@ -33,7 +33,7 @@ farmWarDeployer.removeStart=群集范围内删除web应用程序[{0}]
farmWarDeployer.removeTxMsg=从[{0}]发送群集范围的取消部署
farmWarDeployer.renameFail=将 [{0}] 重命名为 [{1}] 失败
farmWarDeployer.sendEnd=发送群集war部署路径[{0}]，war[{1}]已完成。
-farmWarDeployer.sendFragment=将群集战争片段路径[{0}]，战争[{1}]发送到[{2}]
+farmWarDeployer.sendFragment=将群集war片段路径[{0}]，war[{1}]发送到[{2}]
farmWarDeployer.sendStart=发送集群war部署路径[{0}]，war[{1}]已启动
farmWarDeployer.servicingDeploy=应用程序[{0}]正在服务。再次触摸WAR文件[{1}]！
farmWarDeployer.servicingUndeploy=正在处理应用程序[{0}]，无法从备份群集节点中删除它
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index 4c18965..628ee5c 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -108,7 +108,7 @@ hostConfig.docBaseUrlInvalid=所提供的部署目录无法用URL来表示
hostConfig.expand=正在扩展web应用程序存档文件[{0}]
hostConfig.expand.error=解压WEB应用程序文件[{0}]时异常
hostConfig.ignorePath=忽略appBase中的路径[{0}]以进行自动部署
-hostConfig.illegalWarName=战争名称[{0}]无效。存档将被忽略
+hostConfig.illegalWarName=war名称[{0}]无效。存档将被忽略
hostConfig.jmx.register=注册上下文[{0}]失败。
hostConfig.jmx.unregister=移除注册上下文[{0}]失败
hostConfig.reload=重新加载上下文[{0}]
@@ -121,7 +121,7 @@ hostConfig.undeployVersion=正在取消部署没有活动会话的旧版本上
passwdUserDatabase.readFail=无法从/etc/passwd获取完整的用户集
tomcat.addWebapp.conflictChild=无法在[{0}]处部署到上下文路径[{1}]，因为存在上下文[{2}]
-tomcat.addWebapp.conflictFile=由于现有文件[{2}]的存在，无法在[{0}]将战争部署到上下文路径[{1}]
+tomcat.addWebapp.conflictFile=由于现有文件[{2}]的存在，无法在[{0}]将war部署到上下文路径[{1}]
tomcat.baseDirMakeFail=无法创建用作基本目录的目录{0}
tomcat.baseDirNotDir=基本目录指定的位置[{0}]不是一个目录
tomcat.defaultMimeTypeMappingsFail=无法加载默认MIME类型
-
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 Chinese translation of word "war"
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 0fa353f Fix Chinese translation of word "war"
0fa353f is described below
commit 0fa353f8752973320caa25892d02296a16a79c6e
Author: Yang Yang
AuthorDate: Mon Sep 14 18:50:33 2020 +0800
Fix Chinese translation of word "war"
---
java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties | 4 ++--
java/org/apache/catalina/startup/LocalStrings_zh_CN.properties | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
index cd87218..359d52c 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
@@ -23,7 +23,7 @@ farmWarDeployer.mbeanNameFail=无法为引擎[{0}]和主机[{1}]构造MBean对
farmWarDeployer.modInstall=从 [{1}] 安装 webapp [{0}]
farmWarDeployer.modInstallFail=无法安装 WAR 文件
farmWarDeployer.msgIoe=无法读取服务器场部署文件消息。
-farmWarDeployer.msgRxDeploy=接收集群部署路径[{0}]，战争[{1}]
+farmWarDeployer.msgRxDeploy=接收集群部署路径[{0}]，war[{1}]
farmWarDeployer.msgRxUndeploy=从路径[{0}]接收未部署群集
farmWarDeployer.removeFailLocal=从[{0}]本地移除失败
farmWarDeployer.removeFailRemote=本地从[{0}]删除失败，其他经理有app在服务！
@@ -33,7 +33,7 @@ farmWarDeployer.removeStart=群集范围内删除web应用程序[{0}]
farmWarDeployer.removeTxMsg=从[{0}]发送群集范围的取消部署
farmWarDeployer.renameFail=将 [{0}] 重命名为 [{1}] 失败
farmWarDeployer.sendEnd=发送群集war部署路径[{0}]，war[{1}]已完成。
-farmWarDeployer.sendFragment=将群集战争片段路径[{0}]，战争[{1}]发送到[{2}]
+farmWarDeployer.sendFragment=将群集war片段路径[{0}]，war[{1}]发送到[{2}]
farmWarDeployer.sendStart=发送集群war部署路径[{0}]，war[{1}]已启动
farmWarDeployer.servicingDeploy=应用程序[{0}]正在服务。再次触摸WAR文件[{1}]！
farmWarDeployer.servicingUndeploy=正在处理应用程序[{0}]，无法从备份群集节点中删除它
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index a19552e..c1eb7fd 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -113,7 +113,7 @@ hostConfig.docBaseUrlInvalid=所提供的部署目录无法用URL来表示
hostConfig.expand=正在扩展web应用程序存档文件[{0}]
hostConfig.expand.error=解压WEB应用程序文件[{0}]时异常
hostConfig.ignorePath=忽略appBase中的路径[{0}]以进行自动部署
-hostConfig.illegalWarName=战争名称[{0}]无效。存档将被忽略
+hostConfig.illegalWarName=war名称[{0}]无效。存档将被忽略
hostConfig.jmx.register=注册上下文[{0}]失败。
hostConfig.jmx.unregister=移除注册上下文[{0}]失败
hostConfig.reload=重新加载上下文[{0}]
@@ -126,7 +126,7 @@ hostConfig.undeployVersion=正在取消部署没有活动会话的旧版本上
passwdUserDatabase.readFail=无法从/etc/passwd获取完整的用户集
tomcat.addWebapp.conflictChild=无法在[{0}]处部署到上下文路径[{1}]，因为存在上下文[{2}]
-tomcat.addWebapp.conflictFile=由于现有文件[{2}]的存在，无法在[{0}]将战争部署到上下文路径[{1}]
+tomcat.addWebapp.conflictFile=由于现有文件[{2}]的存在，无法在[{0}]将war部署到上下文路径[{1}]
tomcat.baseDirMakeFail=无法创建用作基本目录的目录{0}
tomcat.baseDirNotDir=基本目录指定的位置[{0}]不是一个目录
tomcat.defaultMimeTypeMappingsFail=无法加载默认MIME类型
-
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 Chinese translation of word "war"
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 a15c400 Fix Chinese translation of word "war"
a15c400 is described below
commit a15c400fff60d4b6d0940f8e6ad837326f58bfe5
Author: Yang Yang
AuthorDate: Mon Sep 14 18:50:33 2020 +0800
Fix Chinese translation of word "war"
---
java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties | 4 ++--
java/org/apache/catalina/startup/LocalStrings_zh_CN.properties | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
index 6cc609c..6a229f8 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
@@ -24,7 +24,7 @@ farmWarDeployer.mbeanNameFail=无法为引擎[{0}]和主机[{1}]构造MBean对
farmWarDeployer.modInstall=从 [{1}] 安装 webapp [{0}]
farmWarDeployer.modInstallFail=无法安装 WAR 文件
farmWarDeployer.msgIoe=无法读取服务器场部署文件消息。
-farmWarDeployer.msgRxDeploy=接收集群部署路径[{0}]，战争[{1}]
+farmWarDeployer.msgRxDeploy=接收集群部署路径[{0}]，war[{1}]
farmWarDeployer.msgRxUndeploy=从路径[{0}]接收未部署群集
farmWarDeployer.removeFailLocal=从[{0}]本地移除失败
farmWarDeployer.removeFailRemote=本地从[{0}]删除失败，其他经理有app在服务！
@@ -34,7 +34,7 @@ farmWarDeployer.removeStart=群集范围内删除web应用程序[{0}]
farmWarDeployer.removeTxMsg=从[{0}]发送群集范围的取消部署
farmWarDeployer.renameFail=将 [{0}] 重命名为 [{1}] 失败
farmWarDeployer.sendEnd=发送群集war部署路径[{0}]，war[{1}]已完成。
-farmWarDeployer.sendFragment=将群集战争片段路径[{0}]，战争[{1}]发送到[{2}]
+farmWarDeployer.sendFragment=将群集war片段路径[{0}]，war[{1}]发送到[{2}]
farmWarDeployer.sendStart=发送集群war部署路径[{0}]，war[{1}]已启动
farmWarDeployer.servicingDeploy=应用程序[{0}]正在服务。再次触摸WAR文件[{1}]！
farmWarDeployer.servicingUndeploy=正在处理应用程序[{0}]，无法从备份群集节点中删除它
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index 237a100..8155d5d 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -128,7 +128,7 @@ hostConfig.docBaseUrlInvalid=所提供的部署目录无法用URL来表示
hostConfig.expand=正在扩展web应用程序存档文件[{0}]
hostConfig.expand.error=解压WEB应用程序文件[{0}]时异常
hostConfig.ignorePath=忽略appBase中的路径[{0}]以进行自动部署
-hostConfig.illegalWarName=战争名称[{0}]无效。存档将被忽略
+hostConfig.illegalWarName=war名称[{0}]无效。存档将被忽略
hostConfig.jmx.register=注册上下文[{0}]失败。
hostConfig.jmx.unregister=移除注册上下文[{0}]失败
hostConfig.reload=重新加载上下文[{0}]
@@ -143,7 +143,7 @@ listener.createFailed=未启用可选侦听器[{0}]
passwdUserDatabase.readFail=无法从/etc/passwd获取完整的用户集
tomcat.addWebapp.conflictChild=无法在[{0}]处部署到上下文路径[{1}]，因为存在上下文[{2}]
-tomcat.addWebapp.conflictFile=由于现有文件[{2}]的存在，无法在[{0}]将战争部署到上下文路径[{1}]
+tomcat.addWebapp.conflictFile=由于现有文件[{2}]的存在，无法在[{0}]将war部署到上下文路径[{1}]
tomcat.baseDirMakeFail=无法创建用作基本目录的目录{0}
tomcat.baseDirNotDir=基本目录指定的位置[{0}]不是一个目录
tomcat.defaultMimeTypeMappingsFail=无法加载默认MIME类型
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #363: Fix Chinese translation of word "war"
markt-asf commented on pull request #363: URL: https://github.com/apache/tomcat/pull/363#issuecomment-694418257 Thanks. Merged. Please note that our preferred route for translation updates is: https://poeditor.com/projects/view?id=221603 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf merged pull request #363: Fix Chinese translation of word "war"
markt-asf merged pull request #363: URL: https://github.com/apache/tomcat/pull/363 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix Chinese translation of word "war"
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 019ed5d Fix Chinese translation of word "war"
019ed5d is described below
commit 019ed5d9f2c31d6f556bc71daff61fa8f757f303
Author: Yang Yang
AuthorDate: Mon Sep 14 18:50:33 2020 +0800
Fix Chinese translation of word "war"
---
java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties | 4 ++--
java/org/apache/catalina/startup/LocalStrings_zh_CN.properties | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
index 6cc609c..6a229f8 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
@@ -24,7 +24,7 @@ farmWarDeployer.mbeanNameFail=无法为引擎[{0}]和主机[{1}]构造MBean对
farmWarDeployer.modInstall=从 [{1}] 安装 webapp [{0}]
farmWarDeployer.modInstallFail=无法安装 WAR 文件
farmWarDeployer.msgIoe=无法读取服务器场部署文件消息。
-farmWarDeployer.msgRxDeploy=接收集群部署路径[{0}]，战争[{1}]
+farmWarDeployer.msgRxDeploy=接收集群部署路径[{0}]，war[{1}]
farmWarDeployer.msgRxUndeploy=从路径[{0}]接收未部署群集
farmWarDeployer.removeFailLocal=从[{0}]本地移除失败
farmWarDeployer.removeFailRemote=本地从[{0}]删除失败，其他经理有app在服务！
@@ -34,7 +34,7 @@ farmWarDeployer.removeStart=群集范围内删除web应用程序[{0}]
farmWarDeployer.removeTxMsg=从[{0}]发送群集范围的取消部署
farmWarDeployer.renameFail=将 [{0}] 重命名为 [{1}] 失败
farmWarDeployer.sendEnd=发送群集war部署路径[{0}]，war[{1}]已完成。
-farmWarDeployer.sendFragment=将群集战争片段路径[{0}]，战争[{1}]发送到[{2}]
+farmWarDeployer.sendFragment=将群集war片段路径[{0}]，war[{1}]发送到[{2}]
farmWarDeployer.sendStart=发送集群war部署路径[{0}]，war[{1}]已启动
farmWarDeployer.servicingDeploy=应用程序[{0}]正在服务。再次触摸WAR文件[{1}]！
farmWarDeployer.servicingUndeploy=正在处理应用程序[{0}]，无法从备份群集节点中删除它
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index 237a100..8155d5d 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -128,7 +128,7 @@ hostConfig.docBaseUrlInvalid=所提供的部署目录无法用URL来表示
hostConfig.expand=正在扩展web应用程序存档文件[{0}]
hostConfig.expand.error=解压WEB应用程序文件[{0}]时异常
hostConfig.ignorePath=忽略appBase中的路径[{0}]以进行自动部署
-hostConfig.illegalWarName=战争名称[{0}]无效。存档将被忽略
+hostConfig.illegalWarName=war名称[{0}]无效。存档将被忽略
hostConfig.jmx.register=注册上下文[{0}]失败。
hostConfig.jmx.unregister=移除注册上下文[{0}]失败
hostConfig.reload=重新加载上下文[{0}]
@@ -143,7 +143,7 @@ listener.createFailed=未启用可选侦听器[{0}]
passwdUserDatabase.readFail=无法从/etc/passwd获取完整的用户集
tomcat.addWebapp.conflictChild=无法在[{0}]处部署到上下文路径[{1}]，因为存在上下文[{2}]
-tomcat.addWebapp.conflictFile=由于现有文件[{2}]的存在，无法在[{0}]将战争部署到上下文路径[{1}]
+tomcat.addWebapp.conflictFile=由于现有文件[{2}]的存在，无法在[{0}]将war部署到上下文路径[{1}]
tomcat.baseDirMakeFail=无法创建用作基本目录的目录{0}
tomcat.baseDirNotDir=基本目录指定的位置[{0}]不是一个目录
tomcat.defaultMimeTypeMappingsFail=无法加载默认MIME类型
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in on tomcat-7-trunk
The Buildbot has detected a build exception on builder tomcat-7-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1778 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch 7.0.x] 2fa8312372223dcc77064a297f5afe787f2a5f6b Blamelist: Mark Thomas BUILD FAILED: exception compile upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Only build JAR files when contents is not up to date
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/7.0.x by this push: new 2fa8312 Only build JAR files when contents is not up to date 2fa8312 is described below commit 2fa8312372223dcc77064a297f5afe787f2a5f6b Author: Mark Thomas AuthorDate: Thu Sep 17 16:04:29 2020 +0100 Only build JAR files when contents is not up to date --- build.xml | 29 + webapps/docs/changelog.xml | 8 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/build.xml b/build.xml index e6c5798..9095535 100644 --- a/build.xml +++ b/build.xml @@ -3329,17 +3329,30 @@ Read the Building page on the Apache Tomcat documentation site for details on ho - - + + + - - - - - + + + + + + + + + + + + + + + + + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index fe1c04e..0d99e7f 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -68,6 +68,14 @@ + + + +When building, only rebuild JAR files if the contents has changed. +(markt) + + + - 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: Only build JAR files when contents is not up to date
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 f80a675 Only build JAR files when contents is not up to date f80a675 is described below commit f80a6755924838543cabca2a1dea3b2d53f467ff Author: Mark Thomas AuthorDate: Thu Sep 17 16:04:29 2020 +0100 Only build JAR files when contents is not up to date --- build.xml | 29 + webapps/docs/changelog.xml | 4 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/build.xml b/build.xml index c593a87..327ce0b 100644 --- a/build.xml +++ b/build.xml @@ -3272,17 +3272,30 @@ Read the Building page on the Apache Tomcat documentation site for details on ho - - + + + - - - - - + + + + + + + + + + + + + + + + + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 32591c0..861d8fc 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -92,6 +92,10 @@ adds a new feature to Procrun that outputs the command to (re-)configure the service with the current settings. (markt) + +When building, only rebuild JAR files if the contents has changed. +(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: Only build JAR files when contents is not up to date
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 dbb7515 Only build JAR files when contents is not up to date dbb7515 is described below commit dbb7515a9ef8ef3c0485d16b1403a284d29ff45e Author: Mark Thomas AuthorDate: Thu Sep 17 16:04:29 2020 +0100 Only build JAR files when contents is not up to date --- build.xml | 51 +- webapps/docs/changelog.xml | 4 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/build.xml b/build.xml index 1ca32af..0a9e785 100644 --- a/build.xml +++ b/build.xml @@ -3631,28 +3631,41 @@ Read the Building page on the Apache Tomcat documentation site for details on ho - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 4792ad1..d6a3589 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -99,6 +99,10 @@ adds a new feature to Procrun that outputs the command to (re-)configure the service with the current settings. (markt) + +When building, only rebuild JAR files (including OSGi and JPMS metadata) +if the contents has changed. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Only build JAR files when contents is not up to date
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new d2b597a Only build JAR files when contents is not up to date d2b597a is described below commit d2b597a623b1b9b8e7aa6be0c45c22c48d37cf40 Author: Mark Thomas AuthorDate: Thu Sep 17 16:04:29 2020 +0100 Only build JAR files when contents is not up to date --- build.xml | 51 +- webapps/docs/changelog.xml | 4 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/build.xml b/build.xml index 717912d..b165c5f 100644 --- a/build.xml +++ b/build.xml @@ -3638,28 +3638,41 @@ Read the Building page on the Apache Tomcat documentation site for details on ho - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 806586f..3076f9b 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -99,6 +99,10 @@ adds a new feature to Procrun that outputs the command to (re-)configure the service with the current settings. (markt) + +When building, only rebuild JAR files (including OSGi and JPMS metadata) +if the contents has changed. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Try to reduce changes of intermittent CI failures
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 6f5222f Try to reduce changes of intermittent CI failures
6f5222f is described below
commit 6f5222f139464bc03439e250e97fd25ebad3ba77
Author: Mark Thomas
AuthorDate: Thu Sep 17 14:41:30 2020 +0100
Try to reduce changes of intermittent CI failures
---
.../tribes/group/interceptors/TestNonBlockingCoordinator.java| 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
index 3d5d4ff..8c611b4 100644
---
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
+++
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
@@ -47,7 +47,10 @@ public class TestNonBlockingCoordinator {
channels[i] = new GroupChannel();
coordinators[i] = new NonBlockingCoordinator();
channels[i].addInterceptor(coordinators[i]);
-channels[i].addInterceptor(new TcpFailureDetector());
+TcpFailureDetector tcpFailureDetector = new TcpFailureDetector();
+// Double default timeout - mainly for loaded CI systems
+
tcpFailureDetector.setReadTestTimeout(tcpFailureDetector.getReadTestTimeout() *
2);
+channels[i].addInterceptor(tcpFailureDetector);
final int j = i;
threads[i] = new Thread() {
@Override
-
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: Try to reduce changes of intermittent CI failures
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 08e055b Try to reduce changes of intermittent CI failures
08e055b is described below
commit 08e055beea9f5e259c7b7901cb586ddda422f769
Author: Mark Thomas
AuthorDate: Thu Sep 17 14:41:30 2020 +0100
Try to reduce changes of intermittent CI failures
---
.../tribes/group/interceptors/TestNonBlockingCoordinator.java| 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
index 3d5d4ff..8c611b4 100644
---
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
+++
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
@@ -47,7 +47,10 @@ public class TestNonBlockingCoordinator {
channels[i] = new GroupChannel();
coordinators[i] = new NonBlockingCoordinator();
channels[i].addInterceptor(coordinators[i]);
-channels[i].addInterceptor(new TcpFailureDetector());
+TcpFailureDetector tcpFailureDetector = new TcpFailureDetector();
+// Double default timeout - mainly for loaded CI systems
+
tcpFailureDetector.setReadTestTimeout(tcpFailureDetector.getReadTestTimeout() *
2);
+channels[i].addInterceptor(tcpFailureDetector);
final int j = i;
threads[i] = new Thread() {
@Override
-
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: Try to reduce changes of intermittent CI failures
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 4df1caf Try to reduce changes of intermittent CI failures
4df1caf is described below
commit 4df1cafd9ac07b5d9bff380fa20ccc4471b5c99f
Author: Mark Thomas
AuthorDate: Thu Sep 17 14:41:30 2020 +0100
Try to reduce changes of intermittent CI failures
---
.../tribes/group/interceptors/TestNonBlockingCoordinator.java| 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
index 3d5d4ff..8c611b4 100644
---
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
+++
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
@@ -47,7 +47,10 @@ public class TestNonBlockingCoordinator {
channels[i] = new GroupChannel();
coordinators[i] = new NonBlockingCoordinator();
channels[i].addInterceptor(coordinators[i]);
-channels[i].addInterceptor(new TcpFailureDetector());
+TcpFailureDetector tcpFailureDetector = new TcpFailureDetector();
+// Double default timeout - mainly for loaded CI systems
+
tcpFailureDetector.setReadTestTimeout(tcpFailureDetector.getReadTestTimeout() *
2);
+channels[i].addInterceptor(tcpFailureDetector);
final int j = i;
threads[i] = new Thread() {
@Override
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Try to reduce changes of intermittent CI failures
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 515b224 Try to reduce changes of intermittent CI failures
515b224 is described below
commit 515b2246e20f1541dbf15b8ac24e67c44bcade9b
Author: Mark Thomas
AuthorDate: Thu Sep 17 14:41:30 2020 +0100
Try to reduce changes of intermittent CI failures
---
.../tribes/group/interceptors/TestNonBlockingCoordinator.java| 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
index 3d5d4ff..8c611b4 100644
---
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
+++
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
@@ -47,7 +47,10 @@ public class TestNonBlockingCoordinator {
channels[i] = new GroupChannel();
coordinators[i] = new NonBlockingCoordinator();
channels[i].addInterceptor(coordinators[i]);
-channels[i].addInterceptor(new TcpFailureDetector());
+TcpFailureDetector tcpFailureDetector = new TcpFailureDetector();
+// Double default timeout - mainly for loaded CI systems
+
tcpFailureDetector.setReadTestTimeout(tcpFailureDetector.getReadTestTimeout() *
2);
+channels[i].addInterceptor(tcpFailureDetector);
final int j = i;
threads[i] = new Thread() {
@Override
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix BZ 64745 - DBCP won; t load under a security manager
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 94b832c Fix BZ 64745 - DBCP won;t load under a security manager
94b832c is described below
commit 94b832cfe119f5fce645525cf245a2f5730cb08d
Author: Mark Thomas
AuthorDate: Thu Sep 17 11:58:23 2020 +0100
Fix BZ 64745 - DBCP won;t load under a security manager
https://bz.apache.org/bugzilla/show_bug.cgi?id=64745
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 1b864ae..5ac1372 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -76,7 +76,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
if (Utils.IS_SECURITY_ENABLED) {
final ClassLoader loader =
BasicDataSource.class.getClassLoader();
final String dbcpPackageName =
BasicDataSource.class.getPackage().getName();
-loader.loadClass(dbcpPackageName +
".BasicDataSource$PaGetConnection");
loader.loadClass(dbcpPackageName +
".DelegatingCallableStatement");
loader.loadClass(dbcpPackageName +
".DelegatingDatabaseMetaData");
loader.loadClass(dbcpPackageName +
".DelegatingPreparedStatement");
-
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 64745 - DBCP won; t load under a security manager
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 8ba1a6f Fix BZ 64745 - DBCP won;t load under a security manager
8ba1a6f is described below
commit 8ba1a6fa15eaa9123b677b37c5da2df2b2f461b7
Author: Mark Thomas
AuthorDate: Thu Sep 17 11:58:23 2020 +0100
Fix BZ 64745 - DBCP won;t load under a security manager
https://bz.apache.org/bugzilla/show_bug.cgi?id=64745
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index eff3e16..61afa6f 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -87,7 +87,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
if (Utils.IS_SECURITY_ENABLED) {
final ClassLoader loader =
BasicDataSource.class.getClassLoader();
final String dbcpPackageName =
BasicDataSource.class.getPackage().getName();
-loader.loadClass(dbcpPackageName +
".BasicDataSource$PaGetConnection");
loader.loadClass(dbcpPackageName +
".DelegatingCallableStatement");
loader.loadClass(dbcpPackageName +
".DelegatingDatabaseMetaData");
loader.loadClass(dbcpPackageName +
".DelegatingPreparedStatement");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix BZ 64745 - DBCP won; t load under a security manager
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 94b832c Fix BZ 64745 - DBCP won;t load under a security manager
94b832c is described below
commit 94b832cfe119f5fce645525cf245a2f5730cb08d
Author: Mark Thomas
AuthorDate: Thu Sep 17 11:58:23 2020 +0100
Fix BZ 64745 - DBCP won;t load under a security manager
https://bz.apache.org/bugzilla/show_bug.cgi?id=64745
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 1b864ae..5ac1372 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -76,7 +76,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
if (Utils.IS_SECURITY_ENABLED) {
final ClassLoader loader =
BasicDataSource.class.getClassLoader();
final String dbcpPackageName =
BasicDataSource.class.getPackage().getName();
-loader.loadClass(dbcpPackageName +
".BasicDataSource$PaGetConnection");
loader.loadClass(dbcpPackageName +
".DelegatingCallableStatement");
loader.loadClass(dbcpPackageName +
".DelegatingDatabaseMetaData");
loader.loadClass(dbcpPackageName +
".DelegatingPreparedStatement");
-
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 64745 - DBCP won; t load under a security manager
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 dd7c92d Fix BZ 64745 - DBCP won;t load under a security manager
dd7c92d is described below
commit dd7c92d5e1f300a011540ef2f4617c1801765bed
Author: Mark Thomas
AuthorDate: Thu Sep 17 11:58:23 2020 +0100
Fix BZ 64745 - DBCP won;t load under a security manager
https://bz.apache.org/bugzilla/show_bug.cgi?id=64745
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 1b864ae..5ac1372 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -76,7 +76,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
if (Utils.IS_SECURITY_ENABLED) {
final ClassLoader loader =
BasicDataSource.class.getClassLoader();
final String dbcpPackageName =
BasicDataSource.class.getPackage().getName();
-loader.loadClass(dbcpPackageName +
".BasicDataSource$PaGetConnection");
loader.loadClass(dbcpPackageName +
".DelegatingCallableStatement");
loader.loadClass(dbcpPackageName +
".DelegatingDatabaseMetaData");
loader.loadClass(dbcpPackageName +
".DelegatingPreparedStatement");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64745] BasicDataSource won't load with enabled SecurityManager
https://bz.apache.org/bugzilla/show_bug.cgi?id=64745 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Thanks for the report and the analysis. Fixed in: - master for 10.0.0-M9 onwards - 9.0.x for 9.0.39 onwards - 8.5.x for 8.5.59 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
buildbot success in on tomcat-85-trunk
The Buildbot has detected a restored build on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2470 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 8aadfc5bccfc757220e93d034dd87d77da9fb4a4 Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64743] When set maxSwallowSizeto -1, the value of connection must be set to close.
https://bz.apache.org/bugzilla/show_bug.cgi?id=64743 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Mark Thomas --- Fixed in: - master for 10.0.0-M9 onwards - 9.0.x for 9.0.39 onwards - 8.5.x for 8.5.59 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.56 created (now f7312d3)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.56 in repository https://gitbox.apache.org/repos/asf/tomcat.git. at f7312d3 Move to correct section No new revisions were added by this update. - 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 64743 - always sending connection:close with maxSwallowSize=-1
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 8aadfc5 Fix BZ 64743 - always sending connection:close with
maxSwallowSize=-1
8aadfc5 is described below
commit 8aadfc5bccfc757220e93d034dd87d77da9fb4a4
Author: Mark Thomas
AuthorDate: Thu Sep 17 09:39:18 2020 +0100
Fix BZ 64743 - always sending connection:close with maxSwallowSize=-1
https://bz.apache.org/bugzilla/show_bug.cgi?id=64743
---
java/org/apache/coyote/http11/Http11Processor.java | 2 +-
webapps/docs/changelog.xml | 6 ++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http11/Http11Processor.java
b/java/org/apache/coyote/http11/Http11Processor.java
index ce346da..13057c4 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -779,7 +779,7 @@ public class Http11Processor extends AbstractProcessor {
// Ignore, an error here is already processed in prepareRequest
// but is done again since the content length is still -1
}
-if (contentLength > 0 &&
+if (contentLength > 0 && protocol.getMaxSwallowSize() > -1 &&
(contentLength - request.getBytesRead() >
protocol.getMaxSwallowSize())) {
// There is more data to swallow than Tomcat will accept so the
// connection is going to be closed. Disable keep-alive which will
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9404a87..32591c0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -66,6 +66,12 @@
Do not send an HTTP/2 PING frame to measure round-trip time when it is
known that the HTTP/2 connection is not in a good state. (markt)
+
+64743: Correct a regression introduced in 8.5.57 that
+caused a Connection: close header to be added to the
+response if the Connector was configured with
+maxSwallowSize=-1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.56 created (now f7312d3)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.56 in repository https://gitbox.apache.org/repos/asf/tomcat.git. at f7312d3 Move to correct section No new revisions were added by this update. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Move to correct section
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new f7312d3 Move to correct section f7312d3 is described below commit f7312d367282be61fe140f1d85bd9e558d54c555 Author: Mark Thomas AuthorDate: Thu Sep 17 09:44:29 2020 +0100 Move to correct section --- webapps/docs/changelog.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 9a4d4a2..806586f 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -62,12 +62,6 @@ Correct numerous spellings throughout the code base. Based on a pull request from John Bampton. (markt) - -64743: Correct a regression introduced in 10.0.0-M7 that -caused a Connection: close header to be added to the -response if the Connector was configured with -maxSwallowSize=-1. (markt) - @@ -79,6 +73,12 @@ Ensure HTTP/2 timeouts are processed for idle connections. (markt) + +64743: Correct a regression introduced in 10.0.0-M7 that +caused a Connection: close header to be added to the +response if the Connector was configured with +maxSwallowSize=-1. (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 64743 - always sending connection:close with maxSwallowSize=-1
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 7db1af0 Fix BZ 64743 - always sending connection:close with
maxSwallowSize=-1
7db1af0 is described below
commit 7db1af07627baafd602d2a6dd4e4f4fdefb2273a
Author: Mark Thomas
AuthorDate: Thu Sep 17 09:39:18 2020 +0100
Fix BZ 64743 - always sending connection:close with maxSwallowSize=-1
https://bz.apache.org/bugzilla/show_bug.cgi?id=64743
---
java/org/apache/coyote/http11/Http11Processor.java | 2 +-
webapps/docs/changelog.xml | 6 ++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http11/Http11Processor.java
b/java/org/apache/coyote/http11/Http11Processor.java
index a64a5fd..1c72c33 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -537,7 +537,7 @@ public class Http11Processor extends AbstractProcessor {
// Ignore, an error here is already processed in prepareRequest
// but is done again since the content length is still -1
}
-if (contentLength > 0 &&
+if (contentLength > 0 && protocol.getMaxSwallowSize() > -1 &&
(contentLength - request.getBytesRead() >
protocol.getMaxSwallowSize())) {
// There is more data to swallow than Tomcat will accept so the
// connection is going to be closed. Disable keep-alive which will
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a37753b..4792ad1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -73,6 +73,12 @@
Ensure HTTP/2 timeouts are processed for idle connections. (markt)
+
+64743: Correct a regression introduced in 9.0.37 that
+caused a Connection: close header to be added to the
+response if the Connector was configured with
+maxSwallowSize=-1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix BZ 64743 - always sending connection:close with maxSwallowSize=-1
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 735b4d5 Fix BZ 64743 - always sending connection:close with
maxSwallowSize=-1
735b4d5 is described below
commit 735b4d5527385db1df87d29a510d3bbc9fa4d0de
Author: Mark Thomas
AuthorDate: Thu Sep 17 09:39:18 2020 +0100
Fix BZ 64743 - always sending connection:close with maxSwallowSize=-1
https://bz.apache.org/bugzilla/show_bug.cgi?id=64743
---
java/org/apache/coyote/http11/Http11Processor.java | 2 +-
webapps/docs/changelog.xml | 6 ++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http11/Http11Processor.java
b/java/org/apache/coyote/http11/Http11Processor.java
index a169cb4..98b1f23 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -537,7 +537,7 @@ public class Http11Processor extends AbstractProcessor {
// Ignore, an error here is already processed in prepareRequest
// but is done again since the content length is still -1
}
-if (contentLength > 0 &&
+if (contentLength > 0 && protocol.getMaxSwallowSize() > -1 &&
(contentLength - request.getBytesRead() >
protocol.getMaxSwallowSize())) {
// There is more data to swallow than Tomcat will accept so the
// connection is going to be closed. Disable keep-alive which will
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0704c4d..9a4d4a2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -62,6 +62,12 @@
Correct numerous spellings throughout the code base. Based on a pull
request from John Bampton. (markt)
+
+64743: Correct a regression introduced in 10.0.0-M7 that
+caused a Connection: close header to be added to the
+response if the Connector was configured with
+maxSwallowSize=-1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64743] When set maxSwallowSizeto -1, the value of connection must be set to close.
https://bz.apache.org/bugzilla/show_bug.cgi?id=64743 Mark Thomas changed: What|Removed |Added OS||All --- Comment #1 from Mark Thomas --- That is a regression in the handling of aborted uploads. We need to ignore the case where maxSwallowSize has been set to less than 0. I'll get this fixed. -- 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 64745] New: BasicDataSource won't load with enabled SecurityManager
https://bz.apache.org/bugzilla/show_bug.cgi?id=64745 Bug ID: 64745 Summary: BasicDataSource won't load with enabled SecurityManager Product: Tomcat 9 Version: 9.0.38 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: sebastian.h...@silbergrau.com Target Milestone: - The inner class org.apache.tomcat.dbcp.dbcp2.BasicDataSource$PaGetConnection was removed in 9.0.38, but the class is still loaded in the static initialization block when the SecurityManager is activated. The problematic code also exists upstream in the Apache Commons DBCP project. I haven't reported it there yet. Stacktrace: Caused by: java.lang.IllegalStateException: Unable to pre-load classes at org.apache.tomcat.dbcp.dbcp2.BasicDataSource.(BasicDataSource.java:94) ~[tomcat-dbcp.jar:9.0.38] ... 123 more Caused by: java.lang.ClassNotFoundException: org.apache.tomcat.dbcp.dbcp2.BasicDataSource$PaGetConnection at java.net.URLClassLoader.findClass(URLClassLoader.java:471) ~[?:?] at java.lang.ClassLoader.loadClass(ClassLoader.java:589) ~[?:?] at java.lang.ClassLoader.loadClass(ClassLoader.java:522) ~[?:?] at org.apache.tomcat.dbcp.dbcp2.BasicDataSource.(BasicDataSource.java:79) ~[tomcat-dbcp.jar:9.0.38] ... 123 more -- 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 64710] NullPointerException in Http2UpgradeHandler.endRequestBodyFrame and BufferOverflowException in SocketBufferHandler
https://bz.apache.org/bugzilla/show_bug.cgi?id=64710 Mark Thomas changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #18 from Mark Thomas --- None. We need a test case that reliably reproduces the issue. -- 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
