date:20200422

Re: Moving taglibs svn repos to the Tomcat archive

2020-04-22 Thread Olivier Lamy

+1

On Thu, 23 Apr 2020 at 06:40, Mark Thomas  wrote:

> Hi all,
>
> Now that taglibs has moved to git, I intend to move all the taglib svn
> repos to the archive directory. If there are no objections, I'll try and
> find time to get this done in ~24 hours time.
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

-- 
Olivier Lamy
http://twitter.com/olamy | http://linkedin.com/in/olamy

[GitHub] [tomcat] larsgrefer opened a new pull request #280: Remove unnecessary boxing and unboxing

2020-04-22 Thread GitBox



larsgrefer opened a new pull request #280:
URL: https://github.com/apache/tomcat/pull/280


   



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

buildbot failure in on tomcat-9-trunk

2020-04-22 Thread buildbot

The Buildbot has detected a new failure on builder tomcat-9-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-9-trunk/builds/193

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' 
triggered this build
Build Source Stamp: [branch 9.0.x] 4e5fb54774905dff9b36d476ec6f616026136ee2
Blamelist: Mark Thomas 

BUILD FAILED: failed compile_1

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: Improve the handling of requests that use an expectation.

2020-04-22 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new c72a877  Improve the handling of requests that use an expectation.
c72a877 is described below

commit c72a8777876cf454174609641d9f6e0117b45230
Author: Mark Thomas 
AuthorDate: Wed Apr 22 22:11:29 2020 +0100

Improve the handling of requests that use an expectation.

Do not disable keep-alive where the response has a non-2xx status code
but the request body has been fully read. Patch by rjung.
---
 java/org/apache/coyote/http11/Http11Processor.java | 2 +-
 webapps/docs/changelog.xml | 5 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index 47953e8..203c16a 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -755,7 +755,7 @@ public class Http11Processor extends AbstractProcessor {
 
 
 private void checkExpectationAndResponseStatus() {
-if (request.hasExpectation() &&
+if (request.hasExpectation() && !isRequestBodyFullyRead() &&
 (response.getStatus() < 200 || response.getStatus() > 299)) {
 // Client sent Expect: 100-continue but received a
 // non-2xx final response. Disable keep-alive (if enabled)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e2e46f7..cfb9a92 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -90,6 +90,11 @@
 Include the problematic data in the error message when reporting that
 the provided request line contains an invalid component. (markt)
   
+  
+Improve the handling of requests that use an expectation. Do not 
disable
+keep-alive where the response has a non-2xx status code but the request
+body has been fully read. (rjung/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: Improve the handling of requests that use an expectation.

2020-04-22 Thread markt

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 4e5fb54  Improve the handling of requests that use an expectation.
4e5fb54 is described below

commit 4e5fb54774905dff9b36d476ec6f616026136ee2
Author: Mark Thomas 
AuthorDate: Wed Apr 22 22:11:29 2020 +0100

Improve the handling of requests that use an expectation.

Do not disable keep-alive where the response has a non-2xx status code
but the request body has been fully read. Patch by rjung.
---
 java/org/apache/coyote/http11/Http11Processor.java | 2 +-
 webapps/docs/changelog.xml | 5 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index aa1569c..e7d44a3 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -513,7 +513,7 @@ public class Http11Processor extends AbstractProcessor {
 
 
 private void checkExpectationAndResponseStatus() {
-if (request.hasExpectation() &&
+if (request.hasExpectation() && !isRequestBodyFullyRead() &&
 (response.getStatus() < 200 || response.getStatus() > 299)) {
 // Client sent Expect: 100-continue but received a
 // non-2xx final response. Disable keep-alive (if enabled)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9988353..a7de3b8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -88,6 +88,11 @@
 Include the problematic data in the error message when reporting that
 the provided request line contains an invalid component. (markt)
   
+  
+Improve the handling of requests that use an expectation. Do not 
disable
+keep-alive where the response has a non-2xx status code but the request
+body has been fully read. (rjung/markt)
+  
 
   
   


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

[tomcat] branch master updated: Improve the handling of requests that use an expectation.

2020-04-22 Thread markt

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 bb2369b  Improve the handling of requests that use an expectation.
bb2369b is described below

commit bb2369bec5ab80079af1223187861d796e57f431
Author: Mark Thomas 
AuthorDate: Wed Apr 22 22:11:29 2020 +0100

Improve the handling of requests that use an expectation.

Do not disable keep-alive where the response has a non-2xx status code
but the request body has been fully read. Patch by rjung.
---
 java/org/apache/coyote/http11/Http11Processor.java | 2 +-
 webapps/docs/changelog.xml | 5 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index a9e56b2..4b6afdb 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -513,7 +513,7 @@ public class Http11Processor extends AbstractProcessor {
 
 
 private void checkExpectationAndResponseStatus() {
-if (request.hasExpectation() &&
+if (request.hasExpectation() && !isRequestBodyFullyRead() &&
 (response.getStatus() < 200 || response.getStatus() > 299)) {
 // Client sent Expect: 100-continue but received a
 // non-2xx final response. Disable keep-alive (if enabled)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b5c0af0..94faf81 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -103,6 +103,11 @@
 Include the problematic data in the error message when reporting that
 the provided request line contains an invalid component. (markt)
   
+  
+Improve the handling of requests that use an expectation. Do not 
disable
+keep-alive where the response has a non-2xx status code but the request
+body has been fully read. (rjung/markt)
+  
 
   
   


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

svn commit: r1876853 - in /tomcat/site/trunk: docs/source.html xdocs/source.xml

2020-04-22 Thread markt

Author: markt
Date: Wed Apr 22 20:58:39 2020
New Revision: 1876853

URL: http://svn.apache.org/viewvc?rev=1876853=rev
Log:
Update source locations now taglibs has migrated to git

Modified:
tomcat/site/trunk/docs/source.html
tomcat/site/trunk/xdocs/source.xml

Modified: tomcat/site/trunk/docs/source.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/source.html?rev=1876853=1876852=1876853=diff
==
--- tomcat/site/trunk/docs/source.html (original)
+++ tomcat/site/trunk/docs/source.html Wed Apr 22 20:58:39 2020
@@ -2,7 +2,7 @@
 Apache Tomcat - Repository 
Accesshttp://tomcat.apache.org/;>Apache 
Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" 
alt="Support Apache">http://www.apache.org/; target="_blank" 
class="pull-left">https://www.google.com/search; method="get">GOhttps://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png; alt="Next ASF 
event">
   Save the date!
 Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10 
(alpha)https://tomcat.apache.org/download-90.cgi;>Tomcat 
9https://tomcat.apache.org/download-80.cgi;>Tomcat 
8https://tomcat.apache.org/download-70.cgi;>Tomcat 
7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 10.0 (alpha)Tomcat 
 >9.0Tomcat 
 >8.5Tomcat 
 >7.0Tomcat Connectorshref="./native-doc/">Tomcat Nativehref="https://cwiki.apache.org/confluence/display/TOMCAT;>Wikihref="./migration.html">Migration Guidehref="./presentations.html">PresentationsProblems? href="./security.html">Security Reportshref="./findhelp.html">Find helphref="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ href="./lists.html">Mailing ListsBug 
 >DatabaseIRCGet 
 >InvolvedOverviewhref="./source.html">Source c
 odeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorship<
 /li>http://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentTable of Contents
-Version ControlGittomcat.gittomcat-connectors.gittomcat-native.gittomcat-training.gitSubversion RepositoryLine endings
+Version ControlGittomcat.gittomcat-connectors.gittomcat-native.gittomcat-training.gittomcat-taglibs-parent.gittomcat-taglibs-standard.gittomcat-taglibs-rdc.gittomcat-taglibs-site.gitSubversion RepositoryLine endings
 Version Control
 
 The Apache Tomcat project is in the process of migrating from Subversion to
@@ -16,13 +16,13 @@ Git for version control. The following c
 Apache Tomcat Connectors
 Apache Tomcat Native
 Apache Tomcat Training
+Taglibs
 
 The following components currently use Subversion as the primary version
 control system:
 
 Tomcat Maven plugin *
 Tomcat web site
-Taglibs
 archive
 
 The Subversion repositories marked with a * are also mirrored to a Git 
repository.
@@ -92,6 +92,50 @@ tagged from this branch. Development wor
 first.
 A web based view of this repository is available via
 https://github.com/apache/tomcat-training;>GitHub.
+tomcat-taglibs-parent.git
+
+This the Git repository that contains the parent POM for the Apache Tomcat
+Tag Libraries. There is currently one active branch:
+
+master
+
+master is the only development branch. All development work occurs in this
+branch.
+A web based view of this repository is available via
+https://github.com/apache/tomcat-taglibs-parent;>GitHub.
+tomcat-taglibs-standard.git
+
+This the Git repository that contains the Apache Tomcat Standard Tag
+Library. There is currently one active branch:
+
+master
+
+master is the only development branch. All development work occurs in this
+branch.
+A web based view of this repository is available via
+https://github.com/apache/tomcat-taglibs-standard;>GitHub.
+tomcat-taglibs-rdc.git
+
+This the Git repository that contains the Apache Tomcat RDC Tag Library.
+There is currently one active branch:
+
+master
+
+master is the only development branch. All development work occurs in this
+branch.
+A web based view of this repository is available via
+https://github.com/apache/tomcat-taglibs-rdc;>GitHub.
+tomcat-taglibs-site.git
+
+This the Git repository that contains the web site for the Apache Tomcat Tag
+Libraries. There

Moving taglibs svn repos to the Tomcat archive

2020-04-22 Thread Mark Thomas

Hi all,

Now that taglibs has moved to git, I intend to move all the taglib svn
repos to the archive directory. If there are no objections, I'll try and
find time to get this done in ~24 hours time.

Mark

-
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: Few more places where parameterized collection constructors can be used

2020-04-22 Thread markt

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 264e164  Few more places where parameterized collection constructors 
can be used
264e164 is described below

commit 264e164ebb16f333a38bcf868eb4b88927fa146b
Author: Mark Thomas 
AuthorDate: Wed Apr 22 21:18:59 2020 +0100

Few more places where parameterized collection constructors can be used
---
 java/org/apache/catalina/core/ApplicationContext.java   | 3 +--
 java/org/apache/catalina/core/StandardContext.java  | 4 +---
 java/org/apache/catalina/ha/session/BackupManager.java  | 6 ++
 java/org/apache/catalina/session/PersistentManagerBase.java | 6 ++
 java/org/apache/catalina/startup/ContextConfig.java | 3 +--
 java/org/apache/coyote/http11/AbstractHttp11Protocol.java   | 7 +++
 java/org/apache/jasper/compiler/PageInfo.java   | 3 +--
 test/org/apache/tomcat/websocket/server/TestClose.java  | 3 +--
 8 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 7033395..77f07a2 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -1362,8 +1362,7 @@ public class ApplicationContext implements ServletContext 
{
 protected void clearAttributes() {
 
 // Create list of attributes to be removed
-List list = new ArrayList();
-list.addAll(attributes.keySet());
+List list = new ArrayList(attributes.keySet());
 
 // Remove application originated attributes
 // (read only attributes will be left in place)
diff --git a/java/org/apache/catalina/core/StandardContext.java 
b/java/org/apache/catalina/core/StandardContext.java
index 495f46a..4624917 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -3920,9 +3920,7 @@ public class StandardContext extends ContainerBase
  */
 @Override
 public String[] findParameters() {
-List parameterNames = new ArrayList(parameters.size());
-parameterNames.addAll(parameters.keySet());
-return parameterNames.toArray(new String[0]);
+return parameters.keySet().toArray(new String[0]);
 }
 
 
diff --git a/java/org/apache/catalina/ha/session/BackupManager.java 
b/java/org/apache/catalina/ha/session/BackupManager.java
index ac642f1..6721f32 100644
--- a/java/org/apache/catalina/ha/session/BackupManager.java
+++ b/java/org/apache/catalina/ha/session/BackupManager.java
@@ -281,10 +281,8 @@ public class BackupManager extends ClusterManagerBase
 
 @Override
 public Set getSessionIdsFull() {
-Set sessionIds = new HashSet();
-LazyReplicatedMap map =
-(LazyReplicatedMap)sessions;
-sessionIds.addAll(map.keySetFull());
+LazyReplicatedMap map = 
(LazyReplicatedMap)sessions;
+Set sessionIds = new HashSet(map.keySetFull());
 return sessionIds;
 }
 
diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java 
b/java/org/apache/catalina/session/PersistentManagerBase.java
index 28541a8..3020dcf 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -677,11 +677,9 @@ public abstract class PersistentManagerBase extends 
ManagerBase
 public Set getSessionIdsFull() {
 // In memory session ID list
 Set sessionIds = new HashSet(sessions.keySet());
-// Store session ID list
-String[] storeKeys;
 try {
-storeKeys = getStore().keys();
-sessionIds.addAll(Arrays.asList(storeKeys));
+// Store session ID list
+sessionIds.addAll(Arrays.asList(getStore().keys()));
 } catch (IOException e) {
 log.warn(sm.getString("persistentManager.storeKeysException"));
 }
diff --git a/java/org/apache/catalina/startup/ContextConfig.java 
b/java/org/apache/catalina/startup/ContextConfig.java
index ada14e1..24e83b5 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -1333,8 +1333,7 @@ public class ContextConfig implements LifecycleListener {
 if (ok) {
 // Spec does not define an order.
 // Use ordered JARs followed by remaining JARs
-Set resourceJars = new LinkedHashSet();
-resourceJars.addAll(orderedFragments);
+Set resourceJars = new 
LinkedHashSet(orderedFragments);
 for (WebXml fragment : fragments.values()) {
 if (!resourceJars.contains(fragment)) {
 resourceJars.add(fragment);
diff --git

[tomcat] branch 8.5.x updated: Few more places where parameterized collection constructors can be used

2020-04-22 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 27dfc54  Few more places where parameterized collection constructors 
can be used
27dfc54 is described below

commit 27dfc540a192376d967a155940df7e074752e83d
Author: Mark Thomas 
AuthorDate: Wed Apr 22 21:18:59 2020 +0100

Few more places where parameterized collection constructors can be used
---
 java/org/apache/catalina/core/ApplicationContext.java  | 3 +--
 java/org/apache/catalina/core/StandardContext.java | 4 +---
 java/org/apache/catalina/ha/session/BackupManager.java | 6 ++
 java/org/apache/catalina/session/PersistentManagerBase.java| 6 ++
 java/org/apache/catalina/startup/ContextConfig.java| 3 +--
 java/org/apache/coyote/http11/AbstractHttp11Protocol.java  | 7 +++
 java/org/apache/coyote/http2/StreamStateMachine.java   | 4 ++--
 java/org/apache/jasper/compiler/PageInfo.java  | 3 +--
 java/org/apache/jasper/servlet/JspCServletContext.java | 3 +--
 java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java | 4 ++--
 test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java | 3 +--
 test/org/apache/tomcat/websocket/server/TestClose.java | 3 +--
 12 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 31419fe..fab9fac 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -1355,8 +1355,7 @@ public class ApplicationContext implements ServletContext 
{
 protected void clearAttributes() {
 
 // Create list of attributes to be removed
-List list = new ArrayList<>();
-list.addAll(attributes.keySet());
+List list = new ArrayList<>(attributes.keySet());
 
 // Remove application originated attributes
 // (read only attributes will be left in place)
diff --git a/java/org/apache/catalina/core/StandardContext.java 
b/java/org/apache/catalina/core/StandardContext.java
index e8cbbe2..32f995a 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -3536,9 +3536,7 @@ public class StandardContext extends ContainerBase
  */
 @Override
 public String[] findParameters() {
-List parameterNames = new ArrayList<>(parameters.size());
-parameterNames.addAll(parameters.keySet());
-return parameterNames.toArray(new String[0]);
+return parameters.keySet().toArray(new String[0]);
 }
 
 
diff --git a/java/org/apache/catalina/ha/session/BackupManager.java 
b/java/org/apache/catalina/ha/session/BackupManager.java
index 58e0903..0d52430 100644
--- a/java/org/apache/catalina/ha/session/BackupManager.java
+++ b/java/org/apache/catalina/ha/session/BackupManager.java
@@ -253,10 +253,8 @@ public class BackupManager extends ClusterManagerBase
 
 @Override
 public Set getSessionIdsFull() {
-Set sessionIds = new HashSet<>();
-LazyReplicatedMap map =
-(LazyReplicatedMap)sessions;
-sessionIds.addAll(map.keySetFull());
+LazyReplicatedMap map = 
(LazyReplicatedMap)sessions;
+Set sessionIds = new HashSet<>(map.keySetFull());
 return sessionIds;
 }
 
diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java 
b/java/org/apache/catalina/session/PersistentManagerBase.java
index 8213467..e83fcf2 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -655,11 +655,9 @@ public abstract class PersistentManagerBase extends 
ManagerBase
 public Set getSessionIdsFull() {
 // In memory session ID list
 Set sessionIds = new HashSet<>(sessions.keySet());
-// Store session ID list
-String[] storeKeys;
 try {
-storeKeys = getStore().keys();
-sessionIds.addAll(Arrays.asList(storeKeys));
+// Store session ID list
+sessionIds.addAll(Arrays.asList(getStore().keys()));
 } catch (IOException e) {
 log.warn(sm.getString("persistentManager.storeKeysException"));
 }
diff --git a/java/org/apache/catalina/startup/ContextConfig.java 
b/java/org/apache/catalina/startup/ContextConfig.java
index 79df4ec..fe8c87d 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -1177,8 +1177,7 @@ public class ContextConfig implements LifecycleListener {
 if (ok) {
 // Spec does not define an order.
 // Use ordered JARs followed by

[tomcat] branch 9.0.x updated: Few more places where parameterized collection constructors can be used

2020-04-22 Thread markt

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 c225860  Few more places where parameterized collection constructors 
can be used
c225860 is described below

commit c2258608674a4edd4517a130316ad135f0cca7e5
Author: Mark Thomas 
AuthorDate: Wed Apr 22 21:18:59 2020 +0100

Few more places where parameterized collection constructors can be used
---
 java/org/apache/catalina/core/ApplicationContext.java  | 3 +--
 java/org/apache/catalina/core/StandardContext.java | 4 +---
 java/org/apache/catalina/ha/session/BackupManager.java | 6 ++
 java/org/apache/catalina/session/PersistentManagerBase.java| 6 ++
 java/org/apache/catalina/startup/ContextConfig.java| 3 +--
 java/org/apache/coyote/http11/AbstractHttp11Protocol.java  | 7 +++
 java/org/apache/coyote/http2/StreamStateMachine.java   | 4 ++--
 java/org/apache/jasper/compiler/PageInfo.java  | 3 +--
 java/org/apache/jasper/servlet/JspCServletContext.java | 3 +--
 java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java | 4 ++--
 java/org/apache/tomcat/util/net/jsse/JSSEUtil.java | 3 +--
 test/org/apache/catalina/users/MemoryUserDatabaseTests.java| 6 ++
 test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java | 3 +--
 test/org/apache/tomcat/websocket/server/TestClose.java | 3 +--
 14 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 1ee44df..cce739b 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -1362,8 +1362,7 @@ public class ApplicationContext implements ServletContext 
{
 protected void clearAttributes() {
 
 // Create list of attributes to be removed
-List list = new ArrayList<>();
-list.addAll(attributes.keySet());
+List list = new ArrayList<>(attributes.keySet());
 
 // Remove application originated attributes
 // (read only attributes will be left in place)
diff --git a/java/org/apache/catalina/core/StandardContext.java 
b/java/org/apache/catalina/core/StandardContext.java
index 400cbe9..c012064 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -3538,9 +3538,7 @@ public class StandardContext extends ContainerBase
  */
 @Override
 public String[] findParameters() {
-List parameterNames = new ArrayList<>(parameters.size());
-parameterNames.addAll(parameters.keySet());
-return parameterNames.toArray(new String[0]);
+return parameters.keySet().toArray(new String[0]);
 }
 
 
diff --git a/java/org/apache/catalina/ha/session/BackupManager.java 
b/java/org/apache/catalina/ha/session/BackupManager.java
index 77cb503..bd3ac83 100644
--- a/java/org/apache/catalina/ha/session/BackupManager.java
+++ b/java/org/apache/catalina/ha/session/BackupManager.java
@@ -269,10 +269,8 @@ public class BackupManager extends ClusterManagerBase
 
 @Override
 public Set getSessionIdsFull() {
-Set sessionIds = new HashSet<>();
-LazyReplicatedMap map =
-(LazyReplicatedMap)sessions;
-sessionIds.addAll(map.keySetFull());
+LazyReplicatedMap map = 
(LazyReplicatedMap)sessions;
+Set sessionIds = new HashSet<>(map.keySetFull());
 return sessionIds;
 }
 
diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java 
b/java/org/apache/catalina/session/PersistentManagerBase.java
index b3badf4..bb669ac 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -650,11 +650,9 @@ public abstract class PersistentManagerBase extends 
ManagerBase
 public Set getSessionIdsFull() {
 // In memory session ID list
 Set sessionIds = new HashSet<>(sessions.keySet());
-// Store session ID list
-String[] storeKeys;
 try {
-storeKeys = getStore().keys();
-sessionIds.addAll(Arrays.asList(storeKeys));
+// Store session ID list
+sessionIds.addAll(Arrays.asList(getStore().keys()));
 } catch (IOException e) {
 log.warn(sm.getString("persistentManager.storeKeysException"));
 }
diff --git a/java/org/apache/catalina/startup/ContextConfig.java 
b/java/org/apache/catalina/startup/ContextConfig.java
index e4ee221..82db594 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -1183,8 +1183,7 @@ public class

[tomcat] branch master updated (4d94096 -> 2a5610c)

2020-04-22 Thread markt

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 4d94096  Fix typo
 add 2a5610c  Few more places where parameterized collection constructors 
can be used

No new revisions were added by this update.

Summary of changes:
 java/org/apache/catalina/core/ApplicationContext.java  | 3 +--
 java/org/apache/catalina/core/StandardContext.java | 4 +---
 java/org/apache/catalina/ha/session/BackupManager.java | 6 ++
 java/org/apache/catalina/session/PersistentManagerBase.java| 6 ++
 java/org/apache/catalina/startup/ContextConfig.java| 3 +--
 java/org/apache/coyote/http11/AbstractHttp11Protocol.java  | 7 +++
 java/org/apache/coyote/http2/StreamStateMachine.java   | 4 ++--
 java/org/apache/jasper/compiler/PageInfo.java  | 3 +--
 java/org/apache/jasper/servlet/JspCServletContext.java | 3 +--
 java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java | 4 ++--
 java/org/apache/tomcat/util/net/jsse/JSSEUtil.java | 3 +--
 test/org/apache/catalina/users/MemoryUserDatabaseTests.java| 6 ++
 test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java | 3 +--
 test/org/apache/tomcat/websocket/server/TestClose.java | 3 +--
 14 files changed, 21 insertions(+), 37 deletions(-)


-
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: Bulk operation can be used instead of iteration

2020-04-22 Thread markt

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 903ad28  Bulk operation can be used instead of iteration
903ad28 is described below

commit 903ad28f726df77fe38db904d1daae3d05a7836c
Author: Lars Grefer 
AuthorDate: Tue Apr 7 18:04:47 2020 +0200

Bulk operation can be used instead of iteration
---
 java/org/apache/catalina/core/ApplicationContext.java| 4 +---
 java/org/apache/catalina/core/ApplicationFilterRegistration.java | 9 +++--
 java/org/apache/catalina/core/ApplicationHttpRequest.java| 9 +++--
 java/org/apache/catalina/core/StandardContext.java   | 4 +---
 java/org/apache/catalina/ha/session/BackupManager.java   | 4 +---
 java/org/apache/catalina/session/PersistentManagerBase.java  | 5 ++---
 java/org/apache/catalina/startup/ContextConfig.java  | 4 +---
 test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java  | 5 ++---
 test/org/apache/tomcat/websocket/server/TestClose.java   | 5 ++---
 webapps/docs/changelog.xml   | 4 
 10 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 5a6acb6..7033395 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -1363,9 +1363,7 @@ public class ApplicationContext implements ServletContext 
{
 
 // Create list of attributes to be removed
 List list = new ArrayList();
-for (String s : attributes.keySet()) {
-list.add(s);
-}
+list.addAll(attributes.keySet());
 
 // Remove application originated attributes
 // (read only attributes will be left in place)
diff --git a/java/org/apache/catalina/core/ApplicationFilterRegistration.java 
b/java/org/apache/catalina/core/ApplicationFilterRegistration.java
index 746f492..cad9dca 100644
--- a/java/org/apache/catalina/core/ApplicationFilterRegistration.java
+++ b/java/org/apache/catalina/core/ApplicationFilterRegistration.java
@@ -17,6 +17,7 @@
 
 package org.apache.catalina.core;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.HashSet;
@@ -118,9 +119,7 @@ public class ApplicationFilterRegistration
 
 for (FilterMap filterMap : filterMaps) {
 if (filterMap.getFilterName().equals(filterDef.getFilterName())) {
-for (String servletName : filterMap.getServletNames()) {
-result.add(servletName);
-}
+result.addAll(Arrays.asList(filterMap.getServletNames()));
 }
 }
 return result;
@@ -134,9 +133,7 @@ public class ApplicationFilterRegistration
 
 for (FilterMap filterMap : filterMaps) {
 if (filterMap.getFilterName().equals(filterDef.getFilterName())) {
-for (String urlPattern : filterMap.getURLPatterns()) {
-result.add(urlPattern);
-}
+result.addAll(Arrays.asList(filterMap.getURLPatterns()));
 }
 }
 return result;
diff --git a/java/org/apache/catalina/core/ApplicationHttpRequest.java 
b/java/org/apache/catalina/core/ApplicationHttpRequest.java
index 3409da4..0d9ec1e 100644
--- a/java/org/apache/catalina/core/ApplicationHttpRequest.java
+++ b/java/org/apache/catalina/core/ApplicationHttpRequest.java
@@ -22,6 +22,7 @@ package org.apache.catalina.core;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.Map;
@@ -851,9 +852,7 @@ class ApplicationHttpRequest extends 
HttpServletRequestWrapper {
 if (values1 == null) {
 // Skip - nothing to merge
 } else if (values1 instanceof String[]) {
-for (String value : (String[]) values1) {
-results.add(value);
-}
+results.addAll(Arrays.asList(values1));
 } else { // String
 results.add(values1.toString());
 }
@@ -861,9 +860,7 @@ class ApplicationHttpRequest extends 
HttpServletRequestWrapper {
 if (values2 == null) {
 // Skip - nothing to merge
 } else if (values2 instanceof String[]) {
-for (String value : (String[]) values2) {
-results.add(value);
-}
+results.addAll(Arrays.asList(values2));
 } else { // String
 results.add(values2.toString());
 }
diff --git a/java/org/apache/catalina/core/StandardContext.java 
b/java/org/apache/catalina/core/StandardContext.java
index

buildbot failure in on tomcat-7-trunk

2020-04-22 Thread buildbot

The Buildbot has detected a new failure on builder tomcat-7-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/1678

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] 666af217f229358f6f7874513b6c3e3ab4249356
Blamelist: Coty Sutherland 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
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

2020-04-22 Thread csutherl

This is an automated email from the ASF dual-hosted git repository.

csutherl 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 a14251f  Fix typo
a14251f is described below

commit a14251f7e46e36dcd24ccb0521649c3877567133
Author: Coty Sutherland 
AuthorDate: Wed Apr 22 15:02:19 2020 -0400

Fix typo
---
 conf/catalina.policy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/catalina.policy b/conf/catalina.policy
index 51c390f..2e6f8df 100644
--- a/conf/catalina.policy
+++ b/conf/catalina.policy
@@ -39,7 +39,7 @@ grant codeBase "file:${java.home}/jre/lib/ext/-" {
 permission java.security.AllPermission;
 };
 
-// These permissions apply to javac when ${java.home] points at $JAVA_HOME/jre
+// These permissions apply to javac when ${java.home} points at $JAVA_HOME/jre
 grant codeBase "file:${java.home}/../lib/-" {
 permission java.security.AllPermission;
 };


-
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 typo

2020-04-22 Thread csutherl

This is an automated email from the ASF dual-hosted git repository.

csutherl 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 666af21  Fix typo
666af21 is described below

commit 666af217f229358f6f7874513b6c3e3ab4249356
Author: Coty Sutherland 
AuthorDate: Wed Apr 22 15:02:19 2020 -0400

Fix typo
---
 conf/catalina.policy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/catalina.policy b/conf/catalina.policy
index 4168720..3e16824 100644
--- a/conf/catalina.policy
+++ b/conf/catalina.policy
@@ -39,7 +39,7 @@ grant codeBase "file:${java.home}/jre/lib/ext/-" {
 permission java.security.AllPermission;
 };
 
-// These permissions apply to javac when ${java.home] points at $JAVA_HOME/jre
+// These permissions apply to javac when ${java.home} points at $JAVA_HOME/jre
 grant codeBase "file:${java.home}/../lib/-" {
 permission java.security.AllPermission;
 };


-
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

2020-04-22 Thread csutherl

This is an automated email from the ASF dual-hosted git repository.

csutherl 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 c08e04f  Fix typo
c08e04f is described below

commit c08e04fdfbbaad920528a02ba236f23f80d27044
Author: Coty Sutherland 
AuthorDate: Wed Apr 22 15:02:19 2020 -0400

Fix typo
---
 conf/catalina.policy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/catalina.policy b/conf/catalina.policy
index e5b2e92..4a5af06 100644
--- a/conf/catalina.policy
+++ b/conf/catalina.policy
@@ -39,7 +39,7 @@ grant codeBase "file:${java.home}/jre/lib/ext/-" {
 permission java.security.AllPermission;
 };
 
-// These permissions apply to javac when ${java.home] points at $JAVA_HOME/jre
+// These permissions apply to javac when ${java.home} points at $JAVA_HOME/jre
 grant codeBase "file:${java.home}/../lib/-" {
 permission java.security.AllPermission;
 };


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

[tomcat] branch master updated: Fix typo

2020-04-22 Thread csutherl

This is an automated email from the ASF dual-hosted git repository.

csutherl 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 4d94096  Fix typo
4d94096 is described below

commit 4d940963dae60f42d5b918d8e5a7a9b997db84f2
Author: Coty Sutherland 
AuthorDate: Wed Apr 22 15:02:19 2020 -0400

Fix typo
---
 conf/catalina.policy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/catalina.policy b/conf/catalina.policy
index 51c390f..2e6f8df 100644
--- a/conf/catalina.policy
+++ b/conf/catalina.policy
@@ -39,7 +39,7 @@ grant codeBase "file:${java.home}/jre/lib/ext/-" {
 permission java.security.AllPermission;
 };
 
-// These permissions apply to javac when ${java.home] points at $JAVA_HOME/jre
+// These permissions apply to javac when ${java.home} points at $JAVA_HOME/jre
 grant codeBase "file:${java.home}/../lib/-" {
 permission java.security.AllPermission;
 };


-
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: Bulk operation can be used instead of iteration

2020-04-22 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new b6b4e68  Bulk operation can be used instead of iteration
b6b4e68 is described below

commit b6b4e68c30d70b126143037ea592d74f610e3db3
Author: Lars Grefer 
AuthorDate: Tue Apr 7 18:04:47 2020 +0200

Bulk operation can be used instead of iteration
---
 java/org/apache/catalina/core/ApplicationContext.java| 4 +---
 java/org/apache/catalina/core/ApplicationFilterRegistration.java | 9 +++--
 java/org/apache/catalina/core/ApplicationHttpRequest.java| 9 +++--
 java/org/apache/catalina/core/ApplicationPushBuilder.java| 5 ++---
 java/org/apache/catalina/core/StandardContext.java   | 4 +---
 java/org/apache/catalina/ha/session/BackupManager.java   | 4 +---
 java/org/apache/catalina/session/PersistentManagerBase.java  | 5 ++---
 java/org/apache/catalina/startup/ContextConfig.java  | 4 +---
 java/org/apache/catalina/webresources/StandardRoot.java  | 5 ++---
 java/org/apache/coyote/http2/StreamStateMachine.java | 5 ++---
 java/org/apache/jasper/servlet/JspCServletContext.java   | 4 +---
 .../apache/tomcat/util/descriptor/web/SecurityConstraint.java| 8 ++--
 java/org/apache/tomcat/util/digester/Digester.java   | 5 ++---
 java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java| 5 ++---
 java/org/apache/tomcat/util/net/jsse/JSSESSLContext.java | 5 ++---
 .../tomcat/util/descriptor/web/TestSecurityConstraint.java   | 5 ++---
 .../apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java| 9 +++--
 test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java  | 5 ++---
 test/org/apache/tomcat/websocket/server/TestClose.java   | 5 ++---
 webapps/docs/changelog.xml   | 4 
 20 files changed, 40 insertions(+), 69 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 7dc4242..31419fe 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -1356,9 +1356,7 @@ public class ApplicationContext implements ServletContext 
{
 
 // Create list of attributes to be removed
 List list = new ArrayList<>();
-for (String s : attributes.keySet()) {
-list.add(s);
-}
+list.addAll(attributes.keySet());
 
 // Remove application originated attributes
 // (read only attributes will be left in place)
diff --git a/java/org/apache/catalina/core/ApplicationFilterRegistration.java 
b/java/org/apache/catalina/core/ApplicationFilterRegistration.java
index 518f130..7c6059b 100644
--- a/java/org/apache/catalina/core/ApplicationFilterRegistration.java
+++ b/java/org/apache/catalina/core/ApplicationFilterRegistration.java
@@ -17,6 +17,7 @@
 
 package org.apache.catalina.core;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.HashSet;
@@ -119,9 +120,7 @@ public class ApplicationFilterRegistration
 
 for (FilterMap filterMap : filterMaps) {
 if (filterMap.getFilterName().equals(filterDef.getFilterName())) {
-for (String servletName : filterMap.getServletNames()) {
-result.add(servletName);
-}
+result.addAll(Arrays.asList(filterMap.getServletNames()));
 }
 }
 return result;
@@ -135,9 +134,7 @@ public class ApplicationFilterRegistration
 
 for (FilterMap filterMap : filterMaps) {
 if (filterMap.getFilterName().equals(filterDef.getFilterName())) {
-for (String urlPattern : filterMap.getURLPatterns()) {
-result.add(urlPattern);
-}
+result.addAll(Arrays.asList(filterMap.getURLPatterns()));
 }
 }
 return result;
diff --git a/java/org/apache/catalina/core/ApplicationHttpRequest.java 
b/java/org/apache/catalina/core/ApplicationHttpRequest.java
index bd27924..05b65c7 100644
--- a/java/org/apache/catalina/core/ApplicationHttpRequest.java
+++ b/java/org/apache/catalina/core/ApplicationHttpRequest.java
@@ -24,6 +24,7 @@ import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.Map;
@@ -860,17 +861,13 @@ class ApplicationHttpRequest extends 
HttpServletRequestWrapper {
 if (values1 == null) {
 // Skip - nothing to merge
 } else {
-for (String value : values1) {
-

[tomcat] branch 9.0.x updated: Bulk operation can be used instead of iteration

2020-04-22 Thread markt

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 1110f9c  Bulk operation can be used instead of iteration
1110f9c is described below

commit 1110f9c86da107243595ea3f49e4d867572cc7db
Author: Lars Grefer 
AuthorDate: Tue Apr 7 18:04:47 2020 +0200

Bulk operation can be used instead of iteration
---
 java/org/apache/catalina/core/ApplicationContext.java| 4 +---
 java/org/apache/catalina/core/ApplicationFilterRegistration.java | 9 +++--
 java/org/apache/catalina/core/ApplicationHttpRequest.java| 9 +++--
 java/org/apache/catalina/core/ApplicationPushBuilder.java| 5 ++---
 java/org/apache/catalina/core/StandardContext.java   | 4 +---
 java/org/apache/catalina/ha/session/BackupManager.java   | 4 +---
 java/org/apache/catalina/session/PersistentManagerBase.java  | 5 ++---
 java/org/apache/catalina/startup/ContextConfig.java  | 4 +---
 java/org/apache/catalina/webresources/StandardRoot.java  | 5 ++---
 java/org/apache/coyote/http2/StreamStateMachine.java | 5 ++---
 java/org/apache/jasper/servlet/JspCServletContext.java   | 4 +---
 .../apache/tomcat/util/descriptor/web/SecurityConstraint.java| 8 ++--
 java/org/apache/tomcat/util/digester/Digester.java   | 5 ++---
 java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java| 5 ++---
 java/org/apache/tomcat/util/net/jsse/JSSESSLContext.java | 5 ++---
 test/org/apache/catalina/users/MemoryUserDatabaseTests.java  | 4 ++--
 .../tomcat/util/descriptor/web/TestSecurityConstraint.java   | 5 ++---
 .../apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java| 9 +++--
 test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java  | 5 ++---
 test/org/apache/tomcat/websocket/server/TestClose.java   | 5 ++---
 webapps/docs/changelog.xml   | 4 
 21 files changed, 42 insertions(+), 71 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 56be0d8..1ee44df 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -1363,9 +1363,7 @@ public class ApplicationContext implements ServletContext 
{
 
 // Create list of attributes to be removed
 List list = new ArrayList<>();
-for (String s : attributes.keySet()) {
-list.add(s);
-}
+list.addAll(attributes.keySet());
 
 // Remove application originated attributes
 // (read only attributes will be left in place)
diff --git a/java/org/apache/catalina/core/ApplicationFilterRegistration.java 
b/java/org/apache/catalina/core/ApplicationFilterRegistration.java
index 518f130..7c6059b 100644
--- a/java/org/apache/catalina/core/ApplicationFilterRegistration.java
+++ b/java/org/apache/catalina/core/ApplicationFilterRegistration.java
@@ -17,6 +17,7 @@
 
 package org.apache.catalina.core;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.HashSet;
@@ -119,9 +120,7 @@ public class ApplicationFilterRegistration
 
 for (FilterMap filterMap : filterMaps) {
 if (filterMap.getFilterName().equals(filterDef.getFilterName())) {
-for (String servletName : filterMap.getServletNames()) {
-result.add(servletName);
-}
+result.addAll(Arrays.asList(filterMap.getServletNames()));
 }
 }
 return result;
@@ -135,9 +134,7 @@ public class ApplicationFilterRegistration
 
 for (FilterMap filterMap : filterMaps) {
 if (filterMap.getFilterName().equals(filterDef.getFilterName())) {
-for (String urlPattern : filterMap.getURLPatterns()) {
-result.add(urlPattern);
-}
+result.addAll(Arrays.asList(filterMap.getURLPatterns()));
 }
 }
 return result;
diff --git a/java/org/apache/catalina/core/ApplicationHttpRequest.java 
b/java/org/apache/catalina/core/ApplicationHttpRequest.java
index e049e83..edd5b86 100644
--- a/java/org/apache/catalina/core/ApplicationHttpRequest.java
+++ b/java/org/apache/catalina/core/ApplicationHttpRequest.java
@@ -24,6 +24,7 @@ import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
@@ -849,17 +850,13 @@ class ApplicationHttpRequest extends 
HttpServletRequestWrapper {
 if (values1 == null) {
 // Skip - nothing to merge
 } else

[tomcat] branch master updated: Update changelog for PR #270

2020-04-22 Thread markt

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 33045bd  Update changelog for PR #270
33045bd is described below

commit 33045bd814d2c20e4f85e6454afe8717471ba26d
Author: Mark Thomas 
AuthorDate: Wed Apr 22 18:24:06 2020 +0100

Update changelog for PR #270
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f589d30..b5c0af0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -146,6 +146,10 @@
 Refactor loops with a condition to exit as soon as the condition is 
met.
 Pull request provided by Lars Grefer. (markt)
   
+  
+Refactor bulk addition to collections to use addAll()
+rather than a loop. Pull request provided by Lars Grefer. (markt)
+  
 
   
 


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

[tomcat] branch master updated: Bulk operation can be used instead of iteration

2020-04-22 Thread markt

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 c73a9ff  Bulk operation can be used instead of iteration
c73a9ff is described below

commit c73a9ff1efe485125e5b0d7a8752799c300fea85
Author: Lars Grefer 
AuthorDate: Tue Apr 7 18:04:47 2020 +0200

Bulk operation can be used instead of iteration
---
 java/org/apache/catalina/core/ApplicationContext.java| 4 +---
 java/org/apache/catalina/core/ApplicationFilterRegistration.java | 9 +++--
 java/org/apache/catalina/core/ApplicationHttpRequest.java| 9 +++--
 java/org/apache/catalina/core/ApplicationPushBuilder.java| 5 ++---
 java/org/apache/catalina/core/StandardContext.java   | 4 +---
 java/org/apache/catalina/ha/session/BackupManager.java   | 4 +---
 java/org/apache/catalina/session/PersistentManagerBase.java  | 5 ++---
 java/org/apache/catalina/startup/ContextConfig.java  | 4 +---
 java/org/apache/catalina/webresources/StandardRoot.java  | 5 ++---
 java/org/apache/coyote/http2/StreamStateMachine.java | 5 ++---
 java/org/apache/jasper/servlet/JspCServletContext.java   | 4 +---
 .../apache/tomcat/util/descriptor/web/SecurityConstraint.java| 8 ++--
 java/org/apache/tomcat/util/digester/Digester.java   | 5 ++---
 java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java| 5 ++---
 java/org/apache/tomcat/util/net/jsse/JSSESSLContext.java | 5 ++---
 test/org/apache/catalina/users/MemoryUserDatabaseTests.java  | 4 ++--
 .../tomcat/util/descriptor/web/TestSecurityConstraint.java   | 5 ++---
 .../apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java| 9 +++--
 test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java  | 5 ++---
 test/org/apache/tomcat/websocket/server/TestClose.java   | 5 ++---
 20 files changed, 38 insertions(+), 71 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index cc49ed3..4e0192a 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -1348,9 +1348,7 @@ public class ApplicationContext implements ServletContext 
{
 
 // Create list of attributes to be removed
 List list = new ArrayList<>();
-for (String s : attributes.keySet()) {
-list.add(s);
-}
+list.addAll(attributes.keySet());
 
 // Remove application originated attributes
 // (read only attributes will be left in place)
diff --git a/java/org/apache/catalina/core/ApplicationFilterRegistration.java 
b/java/org/apache/catalina/core/ApplicationFilterRegistration.java
index 29b03f1..3e919df 100644
--- a/java/org/apache/catalina/core/ApplicationFilterRegistration.java
+++ b/java/org/apache/catalina/core/ApplicationFilterRegistration.java
@@ -17,6 +17,7 @@
 
 package org.apache.catalina.core;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.HashSet;
@@ -119,9 +120,7 @@ public class ApplicationFilterRegistration
 
 for (FilterMap filterMap : filterMaps) {
 if (filterMap.getFilterName().equals(filterDef.getFilterName())) {
-for (String servletName : filterMap.getServletNames()) {
-result.add(servletName);
-}
+result.addAll(Arrays.asList(filterMap.getServletNames()));
 }
 }
 return result;
@@ -135,9 +134,7 @@ public class ApplicationFilterRegistration
 
 for (FilterMap filterMap : filterMaps) {
 if (filterMap.getFilterName().equals(filterDef.getFilterName())) {
-for (String urlPattern : filterMap.getURLPatterns()) {
-result.add(urlPattern);
-}
+result.addAll(Arrays.asList(filterMap.getURLPatterns()));
 }
 }
 return result;
diff --git a/java/org/apache/catalina/core/ApplicationHttpRequest.java 
b/java/org/apache/catalina/core/ApplicationHttpRequest.java
index dc1b537..3b3d749 100644
--- a/java/org/apache/catalina/core/ApplicationHttpRequest.java
+++ b/java/org/apache/catalina/core/ApplicationHttpRequest.java
@@ -24,6 +24,7 @@ import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
@@ -849,17 +850,13 @@ class ApplicationHttpRequest extends 
HttpServletRequestWrapper {
 if (values1 == null) {
 // Skip - nothing to merge
 } else {
-for (String value : values1) {
-

[tomcat] branch 7.0.x updated: Loop can be terminated after condition is met

2020-04-22 Thread markt

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 5dc6fd3  Loop can be terminated after condition is met
5dc6fd3 is described below

commit 5dc6fd36fbb7e938d9c25fabacb1ac97df408813
Author: Lars Grefer 
AuthorDate: Tue Apr 7 18:29:29 2020 +0200

Loop can be terminated after condition is met
---
 java/org/apache/catalina/realm/RealmBase.java  |  5 +++--
 .../catalina/tribes/tipis/AbstractReplicatedMap.java   | 14 ++
 .../apache/coyote/http11/TestAbstractHttp11Processor.java  |  1 +
 webapps/docs/changelog.xml |  4 
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/realm/RealmBase.java 
b/java/org/apache/catalina/realm/RealmBase.java
index 6601cf5..65eaa62 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -900,10 +900,11 @@ public abstract class RealmBase extends 
LifecycleMBeanBase implements GSSRealm {
 }
 
 boolean matched = false;
-for(int k=0; k < patterns.length && !matched; k++) {
+for(int k = 0; k < patterns.length; k++) {
 String pattern = patterns[k];
-if(pattern.equals("/")){
+if (pattern.equals("/")) {
 matched = true;
+break;
 }
 }
 if(matched) {
diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index c005319..bb76c9c 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -837,8 +837,11 @@ public abstract class AbstractReplicatedMap
 public boolean inSet(Member m, Member[] set) {
 if ( set == null ) return false;
 boolean result = false;
-for (int i=0; i
 ArrayList result = new ArrayList();
 for (int i=0; iCollections.toArray().
 Pull request provided by Lars Grefer. (markt)
   
+  
+Refactor loops with a condition to exit as soon as the condition is 
met.
+Pull request provided by Lars Grefer. (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: Loop can be terminated after condition is met

2020-04-22 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 16d345c  Loop can be terminated after condition is met
16d345c is described below

commit 16d345c38e46d0e8392190791bd01a34392cc442
Author: Lars Grefer 
AuthorDate: Tue Apr 7 18:29:29 2020 +0200

Loop can be terminated after condition is met
---
 java/org/apache/catalina/realm/RealmBase.java  |  5 +++--
 java/org/apache/catalina/startup/Tomcat.java   |  2 ++
 .../catalina/tribes/tipis/AbstractReplicatedMap.java   | 14 ++
 test/org/apache/coyote/http11/TestHttp11Processor.java |  1 +
 webapps/docs/changelog.xml |  4 
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/realm/RealmBase.java 
b/java/org/apache/catalina/realm/RealmBase.java
index ec5d010..aa42f3a 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -758,10 +758,11 @@ public abstract class RealmBase extends 
LifecycleMBeanBase implements org.apache
 }
 
 boolean matched = false;
-for(int k=0; k < patterns.length && !matched; k++) {
+for(int k = 0; k < patterns.length; k++) {
 String pattern = patterns[k];
-if(pattern.equals("/")){
+if (pattern.equals("/")) {
 matched = true;
+break;
 }
 }
 if(matched) {
diff --git a/java/org/apache/catalina/startup/Tomcat.java 
b/java/org/apache/catalina/startup/Tomcat.java
index a5244b6..fddc67a 100644
--- a/java/org/apache/catalina/startup/Tomcat.java
+++ b/java/org/apache/catalina/startup/Tomcat.java
@@ -528,6 +528,7 @@ public class Tomcat {
 for (Connector serviceConnector : service.findConnectors()) {
 if (connector == serviceConnector) {
 found = true;
+break;
 }
 }
 if (!found) {
@@ -557,6 +558,7 @@ public class Tomcat {
 for (Container engineHost : engine.findChildren()) {
 if (engineHost == host) {
 found = true;
+break;
 }
 }
 if (!found) {
diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index 2236c50..57a1418 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -823,8 +823,11 @@ public abstract class AbstractReplicatedMap
 public boolean inSet(Member m, Member[] set) {
 if ( set == null ) return false;
 boolean result = false;
-for (int i=0; i
 ArrayList result = new ArrayList<>();
 for (int i=0; iCollections.toArray().
 Pull request provided by Lars Grefer. (markt)
   
+  
+Refactor loops with a condition to exit as soon as the condition is 
met.
+Pull request provided by Lars Grefer. (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 for PR #272

2020-04-22 Thread markt

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 f7faac9  Update changelog for PR #272
f7faac9 is described below

commit f7faac9334b1b41fd45dc0a2344f29ddba4d0299
Author: Mark Thomas 
AuthorDate: Wed Apr 22 17:31:56 2020 +0100

Update changelog for PR #272
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 36c18cb..f589d30 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -142,6 +142,10 @@
 Refactor to use empty arrays with Collections.toArray().
 Pull request provided by Lars Grefer. (markt)
   
+  
+Refactor loops with a condition to exit as soon as the condition is 
met.
+Pull request provided by Lars Grefer. (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 for PR #272

2020-04-22 Thread markt

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 6b09afc  Update changelog for PR #272
6b09afc is described below

commit 6b09afc6ae21319f3a4d1315c28b1e7d9cd41a80
Author: Mark Thomas 
AuthorDate: Wed Apr 22 17:31:56 2020 +0100

Update changelog for PR #272
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5733c89..6925a34 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,6 +127,10 @@
 Refactor to use empty arrays with Collections.toArray().
 Pull request provided by Lars Grefer. (markt)
   
+  
+Refactor loops with a condition to exit as soon as the condition is 
met.
+Pull request provided by Lars Grefer. (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: Loop can be terminated after condition is met

2020-04-22 Thread markt

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 c4a63b2  Loop can be terminated after condition is met
c4a63b2 is described below

commit c4a63b2bb3280b1df36a6959d3cf3d44bc2855ae
Author: Lars Grefer 
AuthorDate: Tue Apr 7 18:29:29 2020 +0200

Loop can be terminated after condition is met
---
 java/org/apache/catalina/realm/RealmBase.java  |  5 +++--
 java/org/apache/catalina/startup/Tomcat.java   |  2 ++
 .../catalina/tribes/tipis/AbstractReplicatedMap.java   | 14 ++
 test/org/apache/coyote/http11/TestHttp11Processor.java |  1 +
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/realm/RealmBase.java 
b/java/org/apache/catalina/realm/RealmBase.java
index 3c5b1e7..4ebeeef 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -756,10 +756,11 @@ public abstract class RealmBase extends 
LifecycleMBeanBase implements Realm {
 }
 
 boolean matched = false;
-for(int k=0; k < patterns.length && !matched; k++) {
+for(int k = 0; k < patterns.length; k++) {
 String pattern = patterns[k];
-if(pattern.equals("/")){
+if (pattern.equals("/")) {
 matched = true;
+break;
 }
 }
 if(matched) {
diff --git a/java/org/apache/catalina/startup/Tomcat.java 
b/java/org/apache/catalina/startup/Tomcat.java
index 1ed9553..e8d6a18 100644
--- a/java/org/apache/catalina/startup/Tomcat.java
+++ b/java/org/apache/catalina/startup/Tomcat.java
@@ -554,6 +554,7 @@ public class Tomcat {
 for (Connector serviceConnector : service.findConnectors()) {
 if (connector == serviceConnector) {
 found = true;
+break;
 }
 }
 if (!found) {
@@ -583,6 +584,7 @@ public class Tomcat {
 for (Container engineHost : engine.findChildren()) {
 if (engineHost == host) {
 found = true;
+break;
 }
 }
 if (!found) {
diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index c6e8c2c..fb2522e 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -824,8 +824,11 @@ public abstract class AbstractReplicatedMap
 public boolean inSet(Member m, Member[] set) {
 if ( set == null ) return false;
 boolean result = false;
-for (int i=0; i
 List result = new ArrayList<>();
 for (int i=0; i

[tomcat] branch master updated: Loop can be terminated after condition is met

2020-04-22 Thread markt

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 694a769  Loop can be terminated after condition is met
694a769 is described below

commit 694a769fd22b89321de2a26103a31c9923c11228
Author: Lars Grefer 
AuthorDate: Tue Apr 7 18:29:29 2020 +0200

Loop can be terminated after condition is met
---
 java/org/apache/catalina/realm/RealmBase.java  |  5 +++--
 java/org/apache/catalina/startup/Tomcat.java   |  2 ++
 .../catalina/tribes/tipis/AbstractReplicatedMap.java   | 14 ++
 test/org/apache/coyote/http11/TestHttp11Processor.java |  1 +
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/realm/RealmBase.java 
b/java/org/apache/catalina/realm/RealmBase.java
index 7d3464b..3334452 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -756,10 +756,11 @@ public abstract class RealmBase extends 
LifecycleMBeanBase implements Realm {
 }
 
 boolean matched = false;
-for(int k=0; k < patterns.length && !matched; k++) {
+for(int k = 0; k < patterns.length; k++) {
 String pattern = patterns[k];
-if(pattern.equals("/")){
+if (pattern.equals("/")) {
 matched = true;
+break;
 }
 }
 if(matched) {
diff --git a/java/org/apache/catalina/startup/Tomcat.java 
b/java/org/apache/catalina/startup/Tomcat.java
index a6f09f3..16bcbab 100644
--- a/java/org/apache/catalina/startup/Tomcat.java
+++ b/java/org/apache/catalina/startup/Tomcat.java
@@ -554,6 +554,7 @@ public class Tomcat {
 for (Connector serviceConnector : service.findConnectors()) {
 if (connector == serviceConnector) {
 found = true;
+break;
 }
 }
 if (!found) {
@@ -583,6 +584,7 @@ public class Tomcat {
 for (Container engineHost : engine.findChildren()) {
 if (engineHost == host) {
 found = true;
+break;
 }
 }
 if (!found) {
diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index c6e8c2c..fb2522e 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -824,8 +824,11 @@ public abstract class AbstractReplicatedMap
 public boolean inSet(Member m, Member[] set) {
 if ( set == null ) return false;
 boolean result = false;
-for (int i=0; i
 List result = new ArrayList<>();
 for (int i=0; i

Re: [tomcat] branch master updated: Tab police

2020-04-22 Thread Mark Thomas

On 22/04/2020 16:25, r...@apache.org wrote:
> This is an automated email from the ASF dual-hosted git repository.
> 
> remm 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 093de0b  Tab police
> 093de0b is described below
> 
> commit 093de0b8881fefaef7ed462ece820cf52bfa902c
> Author: remm 
> AuthorDate: Wed Apr 22 17:25:35 2020 +0200
> 
> Tab police

Thanks for catching this.

Mark

-
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: Tab police

2020-04-22 Thread remm

This is an automated email from the ASF dual-hosted git repository.

remm 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 59b60b9  Tab police
59b60b9 is described below

commit 59b60b9d9bfd2bbd6863a7b707542fe21605f0c5
Author: remm 
AuthorDate: Wed Apr 22 17:25:35 2020 +0200

Tab police
---
 java/org/apache/catalina/core/DefaultInstanceManager.java | 3 +--
 test/org/apache/tomcat/unittest/TesterContext.java| 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java 
b/java/org/apache/catalina/core/DefaultInstanceManager.java
index b7417d4..f67179b 100644
--- a/java/org/apache/catalina/core/DefaultInstanceManager.java
+++ b/java/org/apache/catalina/core/DefaultInstanceManager.java
@@ -444,8 +444,7 @@ public class DefaultInstanceManager implements 
InstanceManager {
 // Use common object to save memory
 annotationsArray = ANNOTATIONS_EMPTY;
 } else {
-annotationsArray = annotations.toArray(
-   new 
AnnotationCacheEntry[0]);
+annotationsArray = annotations.toArray(new 
AnnotationCacheEntry[0]);
 }
 synchronized (annotationCache) {
 annotationCache.put(clazz, annotationsArray);
diff --git a/test/org/apache/tomcat/unittest/TesterContext.java 
b/test/org/apache/tomcat/unittest/TesterContext.java
index 306af1e..7a24e8e 100644
--- a/test/org/apache/tomcat/unittest/TesterContext.java
+++ b/test/org/apache/tomcat/unittest/TesterContext.java
@@ -100,8 +100,7 @@ public class TesterContext implements Context {
 
 @Override
 public SecurityConstraint[] findConstraints() {
-return securityConstraints.toArray(
-   new SecurityConstraint[0]);
+return securityConstraints.toArray(new SecurityConstraint[0]);
 }
 
 @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: Tab police

2020-04-22 Thread remm

This is an automated email from the ASF dual-hosted git repository.

remm 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 97d7398  Tab police
97d7398 is described below

commit 97d7398c7853c3da2d8eafce501324b5b20e9e8d
Author: remm 
AuthorDate: Wed Apr 22 17:25:35 2020 +0200

Tab police
---
 java/org/apache/catalina/core/DefaultInstanceManager.java | 3 +--
 test/org/apache/tomcat/unittest/TesterContext.java| 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java 
b/java/org/apache/catalina/core/DefaultInstanceManager.java
index 52a351c..259f4cf 100644
--- a/java/org/apache/catalina/core/DefaultInstanceManager.java
+++ b/java/org/apache/catalina/core/DefaultInstanceManager.java
@@ -443,8 +443,7 @@ public class DefaultInstanceManager implements 
InstanceManager {
 // Use common object to save memory
 annotationsArray = ANNOTATIONS_EMPTY;
 } else {
-annotationsArray = annotations.toArray(
-   new 
AnnotationCacheEntry[0]);
+annotationsArray = annotations.toArray(new 
AnnotationCacheEntry[0]);
 }
 synchronized (annotationCache) {
 annotationCache.put(clazz, annotationsArray);
diff --git a/test/org/apache/tomcat/unittest/TesterContext.java 
b/test/org/apache/tomcat/unittest/TesterContext.java
index 08b7680..c6d080a 100644
--- a/test/org/apache/tomcat/unittest/TesterContext.java
+++ b/test/org/apache/tomcat/unittest/TesterContext.java
@@ -100,8 +100,7 @@ public class TesterContext implements Context {
 
 @Override
 public SecurityConstraint[] findConstraints() {
-return securityConstraints.toArray(
-   new SecurityConstraint[0]);
+return securityConstraints.toArray(new SecurityConstraint[0]);
 }
 
 @Override


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

[tomcat] branch master updated: Tab police

2020-04-22 Thread remm

This is an automated email from the ASF dual-hosted git repository.

remm 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 093de0b  Tab police
093de0b is described below

commit 093de0b8881fefaef7ed462ece820cf52bfa902c
Author: remm 
AuthorDate: Wed Apr 22 17:25:35 2020 +0200

Tab police
---
 java/org/apache/catalina/core/DefaultInstanceManager.java | 3 +--
 test/org/apache/tomcat/unittest/TesterContext.java| 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java 
b/java/org/apache/catalina/core/DefaultInstanceManager.java
index 4a8adc3..efeb968 100644
--- a/java/org/apache/catalina/core/DefaultInstanceManager.java
+++ b/java/org/apache/catalina/core/DefaultInstanceManager.java
@@ -444,8 +444,7 @@ public class DefaultInstanceManager implements 
InstanceManager {
 // Use common object to save memory
 annotationsArray = ANNOTATIONS_EMPTY;
 } else {
-annotationsArray = annotations.toArray(
-   new 
AnnotationCacheEntry[0]);
+annotationsArray = annotations.toArray(new 
AnnotationCacheEntry[0]);
 }
 synchronized (annotationCache) {
 annotationCache.put(clazz, annotationsArray);
diff --git a/test/org/apache/tomcat/unittest/TesterContext.java 
b/test/org/apache/tomcat/unittest/TesterContext.java
index 4e97140..ebee177 100644
--- a/test/org/apache/tomcat/unittest/TesterContext.java
+++ b/test/org/apache/tomcat/unittest/TesterContext.java
@@ -101,8 +101,7 @@ public class TesterContext implements Context {
 
 @Override
 public SecurityConstraint[] findConstraints() {
-return securityConstraints.toArray(
-   new SecurityConstraint[0]);
+return securityConstraints.toArray(new SecurityConstraint[0]);
 }
 
 @Override


-
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: Use empty arrays for Collections.toArray()

2020-04-22 Thread markt

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 1c2e529  Use empty arrays for Collections.toArray()
1c2e529 is described below

commit 1c2e529a5e6aa835f29c0da83543dc8d7a496058
Author: Lars Grefer 
AuthorDate: Tue Apr 7 18:09:26 2020 +0200

Use empty arrays for Collections.toArray()

There are two styles to convert a collection to an array:
either using a pre-sized array (like c.toArray(new String[c.size()]))
or using an empty array (like c.toArray(new String[0]).

In older Java versions using pre-sized array was recommended,
as the reflection call which is necessary to create an array of proper
size was quite slow.
However since late updates of OpenJDK 6 this call was intrinsified,
making the performance of the empty array version the same and sometimes
even better,
compared to the pre-sized version.

See also: https://shipilev.net/blog/2016/arrays-wisdom-ancients/
---
 java/javax/servlet/jsp/el/ImplicitObjectELResolver.java   |  2 +-
 java/org/apache/catalina/core/ContainerBase.java  |  2 +-
 java/org/apache/catalina/core/DefaultInstanceManager.java |  3 +--
 java/org/apache/catalina/core/StandardContext.java|  2 +-
 java/org/apache/catalina/core/StandardHost.java   |  2 +-
 java/org/apache/catalina/core/StandardWrapper.java|  2 +-
 java/org/apache/catalina/deploy/FilterMap.java|  2 +-
 java/org/apache/catalina/deploy/SecurityConstraint.java   |  2 +-
 java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java |  2 +-
 java/org/apache/catalina/mbeans/ContainerMBean.java   |  4 ++--
 java/org/apache/catalina/mbeans/GroupMBean.java   |  6 ++
 java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java  |  9 +++--
 java/org/apache/catalina/mbeans/NamingResourcesMBean.java | 11 ---
 java/org/apache/catalina/mbeans/UserMBean.java|  6 ++
 java/org/apache/catalina/realm/GenericPrincipal.java  |  6 +++---
 java/org/apache/catalina/servlets/CGIServlet.java |  2 +-
 java/org/apache/catalina/session/FileStore.java   |  2 +-
 java/org/apache/catalina/session/JDBCStore.java   |  2 +-
 java/org/apache/catalina/startup/ClassLoaderFactory.java  |  4 ++--
 java/org/apache/catalina/startup/HostConfig.java  |  2 +-
 java/org/apache/catalina/tribes/ChannelException.java |  2 +-
 java/org/apache/catalina/tribes/group/RpcChannel.java |  2 +-
 .../tribes/group/interceptors/TcpFailureDetector.java |  4 ++--
 .../tribes/group/interceptors/TwoPhaseCommitInterceptor.java  |  2 +-
 .../apache/catalina/tribes/tipis/AbstractReplicatedMap.java   |  4 ++--
 java/org/apache/catalina/tribes/tipis/ReplicatedMap.java  |  2 +-
 .../catalina/tribes/transport/bio/MultipointBioSender.java|  2 +-
 java/org/apache/catalina/tribes/util/Arrays.java  |  4 ++--
 .../org/apache/catalina/valves/StuckThreadDetectionValve.java |  2 +-
 java/org/apache/el/parser/AstMethodParameters.java|  2 +-
 java/org/apache/jasper/compiler/JavacErrorDetail.java |  2 +-
 java/org/apache/jasper/compiler/Validator.java|  2 +-
 .../apache/naming/factory/webservices/ServiceRefFactory.java  |  2 +-
 .../apache/tomcat/dbcp/dbcp/PoolablePreparedStatement.java|  2 +-
 java/org/apache/tomcat/util/http/Parameters.java  |  2 +-
 java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java  |  2 +-
 test/org/apache/tomcat/unittest/TesterContext.java|  5 ++---
 webapps/docs/changelog.xml|  4 
 .../WEB-INF/classes/compressionFilters/CompressionFilter.java |  3 +--
 39 files changed, 57 insertions(+), 66 deletions(-)

diff --git a/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java 
b/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
index 588039d..82f9c09 100644
--- a/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
+++ b/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
@@ -338,7 +338,7 @@ public class ImplicitObjectELResolver extends ELResolver {
 while (e.hasMoreElements()) {
 list.add(e.nextElement());
 }
-return list.toArray(new String[list.size()]);
+return list.toArray(new String[0]);
 }
 return null;
 }
diff --git a/java/org/apache/catalina/core/ContainerBase.java 
b/java/org/apache/catalina/core/ContainerBase.java
index 9a48670..3b5252f 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++

[Bug 64355] Web application and Login page Is very slow and Login page to load is taking 5 minitues in Tomcat 9.0.34

2020-04-22 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=64355

Shreya  changed:

   What|Removed |Added

 Resolution|INVALID |FIXED

--- Comment #4 from Shreya  ---
https://www.tips51.com;>Best-Business-Ideas-Best-Review-Website
https://www.tips51.com/top-10-best-business-ideas;>Best-Business-Ideas
https://www.tips51.com/large-business-ideas;>Large-Business-Ideas
https://www.tips51.com/women-business-ideas;>Women-Business-Ideas
https://www.tips51.com/at-home-business-ideas;>At-Home-Business-Ideas
https://www.tips51.com/coronavirus-treatment/;>Corona-Virus

https://www.tips51.com/top-10-best-hand-sanitizers-in-india-2020;>Best-hand-Sanitizer
https://www.tips51.com/top-10-best-hand-wash-in-india-april-2020;>Best-hand-Wash
https://www.tips51.com/top-5-toilet-seat-sanitizer-spray-in-india-april-2020/;>Toilet-Seat-Sanitizer-Spray
https://www.tips51.com/top-5-women-intimate-wash-in-india-april-2020/;>Intimate-Wash

-- 
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: [tomcat] branch 9.0.x updated: Use empty arrays for Collections.toArray()

2020-04-22 Thread Rémy Maucherat

On Wed, Apr 22, 2020 at 3:13 PM  wrote:

> 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 76c681b  Use empty arrays for Collections.toArray()
> 76c681b is described below
>
> commit 76c681bc1acfd65615a985b6adf527bcc21c18e9
> Author: Lars Grefer 
> AuthorDate: Tue Apr 7 18:09:26 2020 +0200
>
> Use empty arrays for Collections.toArray()
>
> There are two styles to convert a collection to an array:
> either using a pre-sized array (like c.toArray(new String[c.size()]))
> or using an empty array (like c.toArray(new String[0]).
>
> In older Java versions using pre-sized array was recommended,
> as the reflection call which is necessary to create an array of proper
> size was quite slow.
> However since late updates of OpenJDK 6 this call was intrinsified,
> making the performance of the empty array version the same and
> sometimes even better,
> compared to the pre-sized version.
>
> See also: https://shipilev.net/blog/2016/arrays-wisdom-ancients/
>

It says that using a real constant for the 0-size array is not meaningfully
faster, so that's good as well.

Rémy

[tomcat] branch 8.5.x updated: Use empty arrays for Collections.toArray()

2020-04-22 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new de52937  Use empty arrays for Collections.toArray()
de52937 is described below

commit de52937beb1ca38603ae762a904d1be0855a3951
Author: Lars Grefer 
AuthorDate: Tue Apr 7 18:09:26 2020 +0200

Use empty arrays for Collections.toArray()

There are two styles to convert a collection to an array:
either using a pre-sized array (like c.toArray(new String[c.size()]))
or using an empty array (like c.toArray(new String[0]).

In older Java versions using pre-sized array was recommended,
as the reflection call which is necessary to create an array of proper
size was quite slow.
However since late updates of OpenJDK 6 this call was intrinsified,
making the performance of the empty array version the same and sometimes
even better,
compared to the pre-sized version.

See also: https://shipilev.net/blog/2016/arrays-wisdom-ancients/
---
 java/javax/servlet/jsp/el/ImplicitObjectELResolver.java  |  2 +-
 java/org/apache/catalina/core/ContainerBase.java |  2 +-
 java/org/apache/catalina/core/DefaultInstanceManager.java|  2 +-
 java/org/apache/catalina/core/StandardContext.java   |  2 +-
 java/org/apache/catalina/core/StandardHost.java  |  2 +-
 java/org/apache/catalina/core/StandardWrapper.java   |  2 +-
 java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java|  2 +-
 java/org/apache/catalina/loader/WebappClassLoaderBase.java   |  2 +-
 java/org/apache/catalina/mbeans/ContainerMBean.java  |  4 ++--
 java/org/apache/catalina/mbeans/GroupMBean.java  |  4 ++--
 java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java |  6 +++---
 java/org/apache/catalina/mbeans/NamingResourcesMBean.java|  6 +++---
 java/org/apache/catalina/mbeans/UserMBean.java   |  4 ++--
 java/org/apache/catalina/realm/GenericPrincipal.java |  2 +-
 java/org/apache/catalina/servlets/CGIServlet.java|  2 +-
 java/org/apache/catalina/servlets/DefaultServlet.java|  2 +-
 java/org/apache/catalina/session/FileStore.java  |  2 +-
 java/org/apache/catalina/session/JDBCStore.java  |  2 +-
 java/org/apache/catalina/startup/Bootstrap.java  |  2 +-
 java/org/apache/catalina/startup/ClassLoaderFactory.java |  4 ++--
 java/org/apache/catalina/startup/HostConfig.java |  2 +-
 java/org/apache/catalina/storeconfig/StandardContextSF.java  |  2 +-
 java/org/apache/catalina/tribes/ChannelException.java|  2 +-
 java/org/apache/catalina/tribes/group/RpcChannel.java|  2 +-
 .../tribes/group/interceptors/TcpFailureDetector.java|  4 ++--
 .../tribes/group/interceptors/TwoPhaseCommitInterceptor.java |  2 +-
 .../apache/catalina/tribes/tipis/AbstractReplicatedMap.java  |  4 ++--
 java/org/apache/catalina/tribes/tipis/ReplicatedMap.java |  2 +-
 .../catalina/tribes/transport/bio/MultipointBioSender.java   |  2 +-
 java/org/apache/catalina/tribes/util/Arrays.java |  4 ++--
 java/org/apache/catalina/util/ErrorPageSupport.java  |  2 +-
 .../apache/catalina/valves/StuckThreadDetectionValve.java|  2 +-
 .../catalina/webresources/AbstractArchiveResourceSet.java|  2 +-
 java/org/apache/catalina/webresources/StandardRoot.java  | 12 ++--
 java/org/apache/coyote/CompressionConfig.java|  2 +-
 java/org/apache/el/parser/AstMethodParameters.java   |  2 +-
 java/org/apache/el/stream/Stream.java|  2 +-
 java/org/apache/jasper/compiler/JavacErrorDetail.java|  2 +-
 java/org/apache/jasper/compiler/TagLibraryInfoImpl.java  | 12 ++--
 java/org/apache/jasper/compiler/Validator.java   |  2 +-
 .../apache/naming/factory/webservices/ServiceRefFactory.java |  2 +-
 java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java   |  4 ++--
 .../apache/tomcat/dbcp/dbcp2/PoolableCallableStatement.java  |  2 +-
 .../apache/tomcat/dbcp/dbcp2/PoolablePreparedStatement.java  |  2 +-
 java/org/apache/tomcat/dbcp/dbcp2/PoolingDriver.java |  2 +-
 java/org/apache/tomcat/util/descriptor/web/FilterMap.java|  2 +-
 .../tomcat/util/descriptor/web/SecurityConstraint.java   |  4 ++--
 java/org/apache/tomcat/util/http/Parameters.java |  2 +-
 java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java |  2 +-
 java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java|  2 +-
 java/org/apache/tomcat/util/net/SSLUtilBase.java |  6 +++---
 java/org/apache/tomcat/util/net/WriteBuffer.java |  2 +-
 java/org/apache/tomcat/util/net/jsse/JSSESSLContext.java |  2 +-
 java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java  |  2 +-

[tomcat] branch 9.0.x updated: Use empty arrays for Collections.toArray()

2020-04-22 Thread markt

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 76c681b  Use empty arrays for Collections.toArray()
76c681b is described below

commit 76c681bc1acfd65615a985b6adf527bcc21c18e9
Author: Lars Grefer 
AuthorDate: Tue Apr 7 18:09:26 2020 +0200

Use empty arrays for Collections.toArray()

There are two styles to convert a collection to an array:
either using a pre-sized array (like c.toArray(new String[c.size()]))
or using an empty array (like c.toArray(new String[0]).

In older Java versions using pre-sized array was recommended,
as the reflection call which is necessary to create an array of proper size 
was quite slow.
However since late updates of OpenJDK 6 this call was intrinsified,
making the performance of the empty array version the same and sometimes 
even better,
compared to the pre-sized version.

See also: https://shipilev.net/blog/2016/arrays-wisdom-ancients/
---
 java/javax/servlet/jsp/el/ImplicitObjectELResolver.java  |  2 +-
 java/org/apache/catalina/core/ContainerBase.java |  2 +-
 java/org/apache/catalina/core/DefaultInstanceManager.java|  2 +-
 java/org/apache/catalina/core/StandardContext.java   |  2 +-
 java/org/apache/catalina/core/StandardHost.java  |  2 +-
 java/org/apache/catalina/core/StandardWrapper.java   |  2 +-
 java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java|  2 +-
 java/org/apache/catalina/loader/WebappClassLoaderBase.java   |  2 +-
 java/org/apache/catalina/mbeans/ContainerMBean.java  |  4 ++--
 java/org/apache/catalina/mbeans/GroupMBean.java  |  4 ++--
 java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java |  6 +++---
 java/org/apache/catalina/mbeans/NamingResourcesMBean.java|  6 +++---
 java/org/apache/catalina/mbeans/UserMBean.java   |  4 ++--
 java/org/apache/catalina/realm/GenericPrincipal.java |  2 +-
 java/org/apache/catalina/servlets/CGIServlet.java|  2 +-
 java/org/apache/catalina/servlets/DefaultServlet.java|  2 +-
 java/org/apache/catalina/session/FileStore.java  |  2 +-
 java/org/apache/catalina/session/JDBCStore.java  |  2 +-
 java/org/apache/catalina/startup/Bootstrap.java  |  2 +-
 java/org/apache/catalina/startup/ClassLoaderFactory.java |  4 ++--
 java/org/apache/catalina/startup/HostConfig.java |  2 +-
 java/org/apache/catalina/storeconfig/StandardContextSF.java  |  2 +-
 java/org/apache/catalina/tribes/ChannelException.java|  2 +-
 java/org/apache/catalina/tribes/group/RpcChannel.java|  2 +-
 .../tribes/group/interceptors/TcpFailureDetector.java|  4 ++--
 .../tribes/group/interceptors/TwoPhaseCommitInterceptor.java |  2 +-
 .../apache/catalina/tribes/tipis/AbstractReplicatedMap.java  |  4 ++--
 java/org/apache/catalina/tribes/tipis/ReplicatedMap.java |  2 +-
 .../catalina/tribes/transport/bio/MultipointBioSender.java   |  2 +-
 java/org/apache/catalina/tribes/util/Arrays.java |  4 ++--
 java/org/apache/catalina/util/ErrorPageSupport.java  |  2 +-
 .../apache/catalina/valves/StuckThreadDetectionValve.java|  2 +-
 .../catalina/webresources/AbstractArchiveResourceSet.java|  2 +-
 java/org/apache/catalina/webresources/StandardRoot.java  | 12 ++--
 java/org/apache/coyote/CompressionConfig.java|  2 +-
 java/org/apache/el/parser/AstMethodParameters.java   |  2 +-
 java/org/apache/el/stream/Stream.java|  2 +-
 java/org/apache/jasper/compiler/JavacErrorDetail.java|  2 +-
 java/org/apache/jasper/compiler/TagLibraryInfoImpl.java  | 12 ++--
 java/org/apache/jasper/compiler/Validator.java   |  2 +-
 .../apache/naming/factory/webservices/ServiceRefFactory.java |  2 +-
 java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java   |  4 ++--
 .../apache/tomcat/dbcp/dbcp2/PoolableCallableStatement.java  |  2 +-
 .../apache/tomcat/dbcp/dbcp2/PoolablePreparedStatement.java  |  2 +-
 java/org/apache/tomcat/dbcp/dbcp2/PoolingDriver.java |  2 +-
 java/org/apache/tomcat/util/descriptor/web/FilterMap.java|  2 +-
 .../tomcat/util/descriptor/web/SecurityConstraint.java   |  4 ++--
 java/org/apache/tomcat/util/http/Parameters.java |  2 +-
 java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java |  2 +-
 java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java|  2 +-
 java/org/apache/tomcat/util/net/SSLUtilBase.java |  6 +++---
 java/org/apache/tomcat/util/net/WriteBuffer.java |  2 +-
 java/org/apache/tomcat/util/net/jsse/JSSESSLContext.java |  2 +-
 java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java  |  2 +-

[tomcat] branch master updated (a6aad15 -> 3ce60ff)

2020-04-22 Thread markt

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 a6aad15  Use empty arrays for Collections.toArray()
 add 3ce60ff  Update change log for PR #271

No new revisions were added by this update.

Summary of changes:
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)


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

[tomcat] branch master updated (d43f2df -> a6aad15)

2020-04-22 Thread markt

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 d43f2df  Update change log for PR #269
 add a6aad15  Use empty arrays for Collections.toArray()

No new revisions were added by this update.

Summary of changes:
 java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java|  2 +-
 java/org/apache/catalina/core/ContainerBase.java |  2 +-
 java/org/apache/catalina/core/DefaultInstanceManager.java|  2 +-
 java/org/apache/catalina/core/StandardContext.java   |  2 +-
 java/org/apache/catalina/core/StandardHost.java  |  2 +-
 java/org/apache/catalina/core/StandardWrapper.java   |  2 +-
 java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java|  2 +-
 java/org/apache/catalina/loader/WebappClassLoaderBase.java   |  2 +-
 java/org/apache/catalina/mbeans/ContainerMBean.java  |  4 ++--
 java/org/apache/catalina/mbeans/GroupMBean.java  |  4 ++--
 java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java |  6 +++---
 java/org/apache/catalina/mbeans/NamingResourcesMBean.java|  6 +++---
 java/org/apache/catalina/mbeans/UserMBean.java   |  4 ++--
 java/org/apache/catalina/realm/GenericPrincipal.java |  2 +-
 java/org/apache/catalina/servlets/CGIServlet.java|  2 +-
 java/org/apache/catalina/servlets/DefaultServlet.java|  2 +-
 java/org/apache/catalina/session/FileStore.java  |  2 +-
 java/org/apache/catalina/session/JDBCStore.java  |  2 +-
 java/org/apache/catalina/startup/Bootstrap.java  |  2 +-
 java/org/apache/catalina/startup/ClassLoaderFactory.java |  4 ++--
 java/org/apache/catalina/startup/HostConfig.java |  2 +-
 java/org/apache/catalina/storeconfig/StandardContextSF.java  |  2 +-
 java/org/apache/catalina/tribes/ChannelException.java|  2 +-
 java/org/apache/catalina/tribes/group/RpcChannel.java|  2 +-
 .../tribes/group/interceptors/TcpFailureDetector.java|  4 ++--
 .../tribes/group/interceptors/TwoPhaseCommitInterceptor.java |  2 +-
 .../apache/catalina/tribes/tipis/AbstractReplicatedMap.java  |  4 ++--
 java/org/apache/catalina/tribes/tipis/ReplicatedMap.java |  2 +-
 .../catalina/tribes/transport/bio/MultipointBioSender.java   |  2 +-
 java/org/apache/catalina/tribes/util/Arrays.java |  4 ++--
 java/org/apache/catalina/util/ErrorPageSupport.java  |  2 +-
 .../apache/catalina/valves/StuckThreadDetectionValve.java|  2 +-
 .../catalina/webresources/AbstractArchiveResourceSet.java|  2 +-
 java/org/apache/catalina/webresources/StandardRoot.java  | 12 ++--
 java/org/apache/coyote/CompressionConfig.java|  2 +-
 java/org/apache/el/parser/AstMethodParameters.java   |  2 +-
 java/org/apache/el/stream/Stream.java|  2 +-
 java/org/apache/jasper/compiler/JavacErrorDetail.java|  2 +-
 java/org/apache/jasper/compiler/TagLibraryInfoImpl.java  | 12 ++--
 java/org/apache/jasper/compiler/Validator.java   |  2 +-
 .../apache/naming/factory/webservices/ServiceRefFactory.java |  2 +-
 java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java   |  4 ++--
 .../apache/tomcat/dbcp/dbcp2/PoolableCallableStatement.java  |  2 +-
 .../apache/tomcat/dbcp/dbcp2/PoolablePreparedStatement.java  |  2 +-
 java/org/apache/tomcat/dbcp/dbcp2/PoolingDriver.java |  2 +-
 java/org/apache/tomcat/util/descriptor/web/FilterMap.java|  2 +-
 .../tomcat/util/descriptor/web/SecurityConstraint.java   |  4 ++--
 java/org/apache/tomcat/util/http/Parameters.java |  2 +-
 java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java |  2 +-
 java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java|  2 +-
 java/org/apache/tomcat/util/net/SSLUtilBase.java |  6 +++---
 java/org/apache/tomcat/util/net/WriteBuffer.java |  2 +-
 java/org/apache/tomcat/util/net/jsse/JSSESSLContext.java |  2 +-
 java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java  |  2 +-
 java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java   |  6 +++---
 .../catalina/valves/TestLoadBalancerDrainingValve.java   |  2 +-
 test/org/apache/tomcat/unittest/TesterContext.java   |  4 ++--
 .../tomcat/util/net/openssl/ciphers/TesterOpenSSL.java   |  4 ++--
 .../classes/compressionFilters/CompressionFilter.java|  2 +-
 59 files changed, 88 insertions(+), 88 deletions(-)


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

[GitHub] [tomcat] rmaucher commented on issue #277: Refuse adding invalid HTTP 2.0 headers

2020-04-22 Thread GitBox



rmaucher commented on issue #277:
URL: https://github.com/apache/tomcat/pull/277#issuecomment-617758397


   Still, -1, again for your patch. In addition to being ugly, there's no 
provision in the Servlet spec to throw an exception on random header names, 
especially common ones, so failing, fast or slow, is wrong.



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] arkanovicz commented on issue #277: Refuse adding invalid HTTP 2.0 headers

2020-04-22 Thread GitBox



arkanovicz commented on issue #277:
URL: https://github.com/apache/tomcat/pull/277#issuecomment-617753041


   @rmaucher The spec authors justify themselves of this strict policy by 
saying that otherwise it's a vector of attack. I don't know the whereabouts, 
here.
   
   About where to put the filtering, in Response.addHeader() or 
StreamProcessor.prepareHeaders(), I understand your point of view (which is, I 
suppose, to gather all protocol stuff together) but targeting StreamProcessor 
doesn't respect the Fail Fast paradigm, which prevails IMHO.
   



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

Re: Time for Tomcat Native 1.2.24?

2020-04-22 Thread Martin Grigorov

Hi,

On Wed, Apr 22, 2020 at 1:34 PM Mark Thomas  wrote:

> Hi all,
>
> You have probably seen this:
> OpenSSL - CVE-2020-1967
> https://openssl.markmail.org/thread/nuamcatocap7rwrw
>
> I have reviewed the Tomcat Native code and confirmed that we do not call
> SSL_check_chain() at any point.
>
> I also looked at the OpenSSL code as I was concerned that we might hit
> the same problem via an internal code path. It appears I wasn't the only
> one with that concern and the OpenSSL team confirmed that the issue only
> occurs when calling SSL_check_chain():
> https://openssl.markmail.org/thread/okfaim5oqhh2egj6
>
> Therefore, it is not necessary to roll a new Tomcat Native release to
> pick up an updated OpenSSL version for the Windows binaries.
>
> That said, there are a few Tomcat Native fixes since 1.2.23 and it has
> been 9 months since the last release. We should have enough time to get
> a 1.2.24 release out if we want to.
>
> Thoughts?
>

+1
I use a build from master branch for my testing application and I didn't
have any problems with it!

Regards,
Martin


>
> Mark
>
> -
> 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: Use parameterized collection constructors where possible

2020-04-22 Thread markt

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 c9a4561  Use parameterized collection constructors where possible
c9a4561 is described below

commit c9a456160e22d03e66b9528e2a423f499260d804
Author: Lars Grefer 
AuthorDate: Tue Apr 7 17:32:50 2020 +0200

Use parameterized collection constructors where possible

This allows collections like ArrayList and HashSet to initialize their
backing arrays with the correct size.
---
 java/javax/servlet/ServletSecurityElement.java  |  7 ++-
 java/org/apache/catalina/connector/Request.java |  3 +--
 java/org/apache/catalina/core/ApplicationContext.java   |  6 ++
 java/org/apache/catalina/core/AsyncContextImpl.java | 13 -
 java/org/apache/catalina/ha/context/ReplicatedContext.java  |  3 +--
 java/org/apache/catalina/manager/HTMLManagerServlet.java|  3 +--
 java/org/apache/catalina/servlets/CGIServlet.java   |  4 +---
 java/org/apache/catalina/session/ManagerBase.java   | 12 ++--
 java/org/apache/catalina/session/PersistentManagerBase.java |  3 +--
 java/org/apache/catalina/session/StandardSession.java   |  3 +--
 java/org/apache/catalina/startup/HostConfig.java|  3 +--
 java/org/apache/coyote/http11/AbstractHttp11Protocol.java   |  3 +--
 .../apache/tomcat/websocket/BackgroundProcessManager.java   |  4 ++--
 test/org/apache/catalina/deploy/TestWebXmlOrdering.java |  6 ++
 .../apache/catalina/servlets/ServletOptionsBaseTest.java|  3 +--
 test/org/apache/catalina/startup/TestTomcatNoServer.java|  9 +++--
 test/org/apache/catalina/valves/TestRemoteIpValve.java  |  6 ++
 test/org/apache/tomcat/util/buf/TestCharsetCache.java   |  6 ++
 webapps/docs/changelog.xml  |  4 
 19 files changed, 38 insertions(+), 63 deletions(-)

diff --git a/java/javax/servlet/ServletSecurityElement.java 
b/java/javax/servlet/ServletSecurityElement.java
index caa9a27..278321a 100644
--- a/java/javax/servlet/ServletSecurityElement.java
+++ b/java/javax/servlet/ServletSecurityElement.java
@@ -108,15 +108,12 @@ public class ServletSecurityElement extends 
HttpConstraintElement {
 }
 
 public Collection getHttpMethodConstraints() {
-Collection result =
-new HashSet();
-result.addAll(methodConstraints.values());
+Collection result = new 
HashSet(methodConstraints.values());
 return result;
 }
 
 public Collection getMethodNames() {
-Collection result = new HashSet();
-result.addAll(methodConstraints.keySet());
+Collection result = new 
HashSet(methodConstraints.keySet());
 return result;
 }
 
diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 611d2da..59f91f7 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -1065,8 +1065,7 @@ public class Request implements HttpServletRequest {
 }
 // Take a copy to prevent ConcurrentModificationExceptions if used to
 // remove attributes
-Set names = new HashSet();
-names.addAll(attributes.keySet());
+Set names = new HashSet(attributes.keySet());
 return Collections.enumeration(names);
 }
 
diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index e76c54c..5a6acb6 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -231,8 +231,7 @@ public class ApplicationContext implements ServletContext {
 
 @Override
 public Enumeration getAttributeNames() {
-Set names = new HashSet();
-names.addAll(attributes.keySet());
+Set names = new HashSet(attributes.keySet());
 return Collections.enumeration(names);
 }
 
@@ -329,8 +328,7 @@ public class ApplicationContext implements ServletContext {
 
 @Override
 public Enumeration getInitParameterNames() {
-Set names = new HashSet();
-names.addAll(parameters.keySet());
+Set names = new HashSet(parameters.keySet());
 // Special handling for XML settings as these attributes will always be
 // available if they have been set on the context
 if (context.getTldValidation()) {
diff --git a/java/org/apache/catalina/core/AsyncContextImpl.java 
b/java/org/apache/catalina/core/AsyncContextImpl.java
index f57f7d1..a92a629 100644
--- a/java/org/apache/catalina/core/AsyncContextImpl.java
+++ b/java/org/apache/catalina/core/AsyncContextImpl.java
@@ -101,8 +101,7 @@ public class AsyncContextImpl implements AsyncContext,

[tomcat] branch 8.5.x updated: Use parameterized collection constructors where possible

2020-04-22 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new c6a8acd  Use parameterized collection constructors where possible
c6a8acd is described below

commit c6a8acdf62e2290ec08ca0aa8c3e3863bba47c90
Author: Lars Grefer 
AuthorDate: Tue Apr 7 17:32:50 2020 +0200

Use parameterized collection constructors where possible

This allows collections like ArrayList and HashSet to initialize their
backing arrays with the correct size.
---
 java/javax/el/LambdaExpression.java  |  3 +--
 java/javax/servlet/ServletSecurityElement.java   |  6 ++
 java/org/apache/catalina/connector/Request.java  |  3 +--
 java/org/apache/catalina/core/ApplicationContext.java|  6 ++
 java/org/apache/catalina/core/AsyncContextImpl.java  | 12 
 java/org/apache/catalina/ha/context/ReplicatedContext.java   |  3 +--
 java/org/apache/catalina/manager/HTMLManagerServlet.java |  3 +--
 java/org/apache/catalina/servlets/CGIServlet.java|  4 +---
 java/org/apache/catalina/session/ManagerBase.java| 12 ++--
 java/org/apache/catalina/session/PersistentManagerBase.java  |  3 +--
 java/org/apache/catalina/session/StandardSession.java|  3 +--
 java/org/apache/catalina/startup/HostConfig.java |  3 +--
 java/org/apache/coyote/http11/AbstractHttp11Protocol.java|  3 +--
 java/org/apache/coyote/http2/HPackHuffman.java   |  3 +--
 java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java|  3 +--
 java/org/apache/tomcat/util/net/SSLUtilBase.java |  3 +--
 java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java  |  3 +--
 java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java  |  3 +--
 .../apache/tomcat/websocket/BackgroundProcessManager.java|  4 ++--
 .../org/apache/catalina/servlets/ServletOptionsBaseTest.java |  3 +--
 test/org/apache/catalina/startup/TestTomcatNoServer.java |  9 +++--
 test/org/apache/catalina/valves/TestRemoteIpValve.java   |  6 ++
 test/org/apache/tomcat/util/buf/TestCharsetCache.java|  6 ++
 .../tomcat/util/descriptor/web/TestWebXmlOrdering.java   |  6 ++
 .../apache/tomcat/util/net/openssl/ciphers/TestCipher.java   | 10 +++---
 webapps/docs/changelog.xml   |  4 
 26 files changed, 47 insertions(+), 80 deletions(-)

diff --git a/java/javax/el/LambdaExpression.java 
b/java/javax/el/LambdaExpression.java
index 7e9ca06..36c7929 100644
--- a/java/javax/el/LambdaExpression.java
+++ b/java/javax/el/LambdaExpression.java
@@ -65,8 +65,7 @@ public class LambdaExpression {
 // Build the argument map
 // Start with the arguments from any outer expressions so if there is
 // any overlap the local arguments have priority
-Map lambdaArguments = new HashMap<>();
-lambdaArguments.putAll(nestedArguments);
+Map lambdaArguments = new HashMap<>(nestedArguments);
 for (int i = 0; i < formalParamCount; i++) {
 lambdaArguments.put(formalParameters.get(i), args[i]);
 }
diff --git a/java/javax/servlet/ServletSecurityElement.java 
b/java/javax/servlet/ServletSecurityElement.java
index 199779e..75542c2 100644
--- a/java/javax/servlet/ServletSecurityElement.java
+++ b/java/javax/servlet/ServletSecurityElement.java
@@ -107,14 +107,12 @@ public class ServletSecurityElement extends 
HttpConstraintElement {
 }
 
 public Collection getHttpMethodConstraints() {
-Collection result = new HashSet<>();
-result.addAll(methodConstraints.values());
+Collection result = new 
HashSet<>(methodConstraints.values());
 return result;
 }
 
 public Collection getMethodNames() {
-Collection result = new HashSet<>();
-result.addAll(methodConstraints.keySet());
+Collection result = new HashSet<>(methodConstraints.keySet());
 return result;
 }
 
diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 301d5a9..2d13f82 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -989,8 +989,7 @@ public class Request implements HttpServletRequest {
 }
 // Take a copy to prevent ConcurrentModificationExceptions if used to
 // remove attributes
-Set names = new HashSet<>();
-names.addAll(attributes.keySet());
+Set names = new HashSet<>(attributes.keySet());
 return Collections.enumeration(names);
 }
 
diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 8a42c24..7dc4242 100644
---

[tomcat] branch 9.0.x updated: Use parameterized collection constructors where possible

2020-04-22 Thread markt

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 6286662  Use parameterized collection constructors where possible
6286662 is described below

commit 6286662c82fbdc48e42a23663690608597dc48e7
Author: Lars Grefer 
AuthorDate: Tue Apr 7 17:32:50 2020 +0200

Use parameterized collection constructors where possible

This allows collections like ArrayList and HashSet to initialize their 
backing arrays
with the correct size.
---
 java/javax/el/LambdaExpression.java  |  3 +--
 java/javax/servlet/ServletSecurityElement.java   |  6 ++
 java/org/apache/catalina/connector/Request.java  |  6 ++
 java/org/apache/catalina/core/ApplicationContext.java|  6 ++
 java/org/apache/catalina/core/AsyncContextImpl.java  | 12 
 java/org/apache/catalina/ha/context/ReplicatedContext.java   |  3 +--
 java/org/apache/catalina/manager/HTMLManagerServlet.java |  3 +--
 java/org/apache/catalina/servlets/CGIServlet.java|  4 +---
 java/org/apache/catalina/session/ManagerBase.java| 12 ++--
 java/org/apache/catalina/session/PersistentManagerBase.java  |  3 +--
 java/org/apache/catalina/session/StandardSession.java|  3 +--
 java/org/apache/catalina/startup/HostConfig.java |  3 +--
 java/org/apache/coyote/http11/AbstractHttp11Protocol.java|  3 +--
 java/org/apache/coyote/http2/HPackHuffman.java   |  3 +--
 java/org/apache/coyote/http2/Http2UpgradeHandler.java|  3 +--
 java/org/apache/jasper/compiler/TagLibraryInfoImpl.java  |  3 +--
 java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java|  3 +--
 java/org/apache/tomcat/util/net/SSLUtilBase.java |  6 ++
 java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java  |  3 +--
 java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java  |  3 +--
 .../apache/tomcat/websocket/BackgroundProcessManager.java|  4 ++--
 .../org/apache/catalina/servlets/ServletOptionsBaseTest.java |  3 +--
 test/org/apache/catalina/startup/TestTomcatNoServer.java |  9 +++--
 test/org/apache/catalina/valves/TestRemoteIpValve.java   |  6 ++
 test/org/apache/tomcat/util/buf/TestCharsetCache.java|  6 ++
 .../tomcat/util/descriptor/web/TestWebXmlOrdering.java   |  6 ++
 .../apache/tomcat/util/net/openssl/ciphers/TestCipher.java   | 10 +++---
 webapps/docs/changelog.xml   |  4 
 28 files changed, 51 insertions(+), 88 deletions(-)

diff --git a/java/javax/el/LambdaExpression.java 
b/java/javax/el/LambdaExpression.java
index 7e9ca06..36c7929 100644
--- a/java/javax/el/LambdaExpression.java
+++ b/java/javax/el/LambdaExpression.java
@@ -65,8 +65,7 @@ public class LambdaExpression {
 // Build the argument map
 // Start with the arguments from any outer expressions so if there is
 // any overlap the local arguments have priority
-Map lambdaArguments = new HashMap<>();
-lambdaArguments.putAll(nestedArguments);
+Map lambdaArguments = new HashMap<>(nestedArguments);
 for (int i = 0; i < formalParamCount; i++) {
 lambdaArguments.put(formalParameters.get(i), args[i]);
 }
diff --git a/java/javax/servlet/ServletSecurityElement.java 
b/java/javax/servlet/ServletSecurityElement.java
index 199779e..75542c2 100644
--- a/java/javax/servlet/ServletSecurityElement.java
+++ b/java/javax/servlet/ServletSecurityElement.java
@@ -107,14 +107,12 @@ public class ServletSecurityElement extends 
HttpConstraintElement {
 }
 
 public Collection getHttpMethodConstraints() {
-Collection result = new HashSet<>();
-result.addAll(methodConstraints.values());
+Collection result = new 
HashSet<>(methodConstraints.values());
 return result;
 }
 
 public Collection getMethodNames() {
-Collection result = new HashSet<>();
-result.addAll(methodConstraints.keySet());
+Collection result = new HashSet<>(methodConstraints.keySet());
 return result;
 }
 
diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 6d913f0..43342d6 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -962,8 +962,7 @@ public class Request implements HttpServletRequest {
 }
 // Take a copy to prevent ConcurrentModificationExceptions if used to
 // remove attributes
-Set names = new HashSet<>();
-names.addAll(attributes.keySet());
+Set names = new HashSet<>(attributes.keySet());
 return Collections.enumeration(names);
 }
 
@@ -2010,8 +2009,7 @@ public class Request implements

[tomcat] branch master updated: Update change log for PR #269

2020-04-22 Thread markt

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 d43f2df  Update change log for PR #269
d43f2df is described below

commit d43f2df565ef90dcf7a3b4139d894a2127e50ab6
Author: Mark Thomas 
AuthorDate: Wed Apr 22 12:13:46 2020 +0100

Update change log for PR #269
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 882d5a7..2cefbc6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -134,6 +134,10 @@
 Add missing entries to test class path in sample NetBeans configuration
 files. Patch provided by Brian Burch. (markt)
   
+  
+Refactor to use parameterized Collection constructors 
where
+possible. Pull request provided by Lars Grefer. (markt)
+  
 
   
 


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

[tomcat] branch master updated: Use parameterized collection constructors where possible

2020-04-22 Thread markt

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 eb03b77  Use parameterized collection constructors where possible
eb03b77 is described below

commit eb03b77a8fe9c865463467aceff83342e9744689
Author: Lars Grefer 
AuthorDate: Tue Apr 7 17:32:50 2020 +0200

Use parameterized collection constructors where possible

This allows collections like ArrayList and HashSet to initialize their 
backing arrays
with the correct size.
---
 java/jakarta/el/LambdaExpression.java|  3 +--
 java/jakarta/servlet/ServletSecurityElement.java |  6 ++
 java/org/apache/catalina/connector/Request.java  |  6 ++
 java/org/apache/catalina/core/ApplicationContext.java|  6 ++
 java/org/apache/catalina/core/AsyncContextImpl.java  | 12 
 java/org/apache/catalina/ha/context/ReplicatedContext.java   |  3 +--
 java/org/apache/catalina/manager/HTMLManagerServlet.java |  3 +--
 java/org/apache/catalina/servlets/CGIServlet.java|  4 +---
 java/org/apache/catalina/session/ManagerBase.java| 12 ++--
 java/org/apache/catalina/session/PersistentManagerBase.java  |  3 +--
 java/org/apache/catalina/session/StandardSession.java|  3 +--
 java/org/apache/catalina/startup/HostConfig.java |  3 +--
 java/org/apache/coyote/http11/AbstractHttp11Protocol.java|  3 +--
 java/org/apache/coyote/http2/HPackHuffman.java   |  3 +--
 java/org/apache/coyote/http2/Http2UpgradeHandler.java|  3 +--
 java/org/apache/jasper/compiler/TagLibraryInfoImpl.java  |  3 +--
 java/org/apache/tomcat/buildutil/MimeTypeMappings.java   |  3 +--
 java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java|  3 +--
 java/org/apache/tomcat/util/net/SSLUtilBase.java |  6 ++
 java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java  |  3 +--
 java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java  |  3 +--
 .../apache/tomcat/websocket/BackgroundProcessManager.java|  4 ++--
 .../org/apache/catalina/servlets/ServletOptionsBaseTest.java |  3 +--
 test/org/apache/catalina/startup/TestTomcatNoServer.java |  9 +++--
 test/org/apache/catalina/valves/TestRemoteIpValve.java   |  6 ++
 test/org/apache/tomcat/util/buf/TestCharsetCache.java|  6 ++
 .../tomcat/util/descriptor/web/TestWebXmlOrdering.java   |  6 ++
 .../apache/tomcat/util/net/openssl/ciphers/TestCipher.java   | 10 +++---
 28 files changed, 48 insertions(+), 90 deletions(-)

diff --git a/java/jakarta/el/LambdaExpression.java 
b/java/jakarta/el/LambdaExpression.java
index 8863ab9..b12c509 100644
--- a/java/jakarta/el/LambdaExpression.java
+++ b/java/jakarta/el/LambdaExpression.java
@@ -65,8 +65,7 @@ public class LambdaExpression {
 // Build the argument map
 // Start with the arguments from any outer expressions so if there is
 // any overlap the local arguments have priority
-Map lambdaArguments = new HashMap<>();
-lambdaArguments.putAll(nestedArguments);
+Map lambdaArguments = new HashMap<>(nestedArguments);
 for (int i = 0; i < formalParamCount; i++) {
 lambdaArguments.put(formalParameters.get(i), args[i]);
 }
diff --git a/java/jakarta/servlet/ServletSecurityElement.java 
b/java/jakarta/servlet/ServletSecurityElement.java
index 2b820a3..cc7f127 100644
--- a/java/jakarta/servlet/ServletSecurityElement.java
+++ b/java/jakarta/servlet/ServletSecurityElement.java
@@ -107,14 +107,12 @@ public class ServletSecurityElement extends 
HttpConstraintElement {
 }
 
 public Collection getHttpMethodConstraints() {
-Collection result = new HashSet<>();
-result.addAll(methodConstraints.values());
+Collection result = new 
HashSet<>(methodConstraints.values());
 return result;
 }
 
 public Collection getMethodNames() {
-Collection result = new HashSet<>();
-result.addAll(methodConstraints.keySet());
+Collection result = new HashSet<>(methodConstraints.keySet());
 return result;
 }
 
diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 74f9ad5..84549d0 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -930,8 +930,7 @@ public class Request implements HttpServletRequest {
 }
 // Take a copy to prevent ConcurrentModificationExceptions if used to
 // remove attributes
-Set names = new HashSet<>();
-names.addAll(attributes.keySet());
+Set names = new HashSet<>(attributes.keySet());
 return Collections.enumeration(names);
 }
 
@@ -1978,8 +1977,7 @@ public class

[GitHub] [tomcat] markt-asf commented on issue #269: Use parameterized collection constructors where possible

2020-04-22 Thread GitBox



markt-asf commented on issue #269:
URL: https://github.com/apache/tomcat/pull/269#issuecomment-617706987


   `Collections.unmodifiable[Set|Map|List]` is probably an option in some cases 
but some (most?) of these instances are returned as part of a public API and if 
the API doesn't state they are modifiable then we can't use this approach. 
Probably a discussion for the dev@ list.
   The approach used in the PR is sound. I just want to review the full diff 
and then I'll merge it.



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

Time for Tomcat Native 1.2.24?

2020-04-22 Thread Mark Thomas

Hi all,

You have probably seen this:
OpenSSL - CVE-2020-1967
https://openssl.markmail.org/thread/nuamcatocap7rwrw

I have reviewed the Tomcat Native code and confirmed that we do not call
SSL_check_chain() at any point.

I also looked at the OpenSSL code as I was concerned that we might hit
the same problem via an internal code path. It appears I wasn't the only
one with that concern and the OpenSSL team confirmed that the issue only
occurs when calling SSL_check_chain():
https://openssl.markmail.org/thread/okfaim5oqhh2egj6

Therefore, it is not necessary to roll a new Tomcat Native release to
pick up an updated OpenSSL version for the Windows binaries.

That said, there are a few Tomcat Native fixes since 1.2.23 and it has
been 9 months since the last release. We should have enough time to get
a 1.2.24 release out if we want to.

Thoughts?

Mark

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

[tomcat-native] branch master updated: Add changelog entry for BZ 63701

2020-04-22 Thread markt

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-native.git


The following commit(s) were added to refs/heads/master by this push:
 new db11788  Add changelog entry for BZ 63701
db11788 is described below

commit db117888ea6326a2e2b289ca69710eb09bebb6ce
Author: Mark Thomas 
AuthorDate: Wed Apr 22 11:26:05 2020 +0100

Add changelog entry for BZ 63701

https://bz.apache.org/bugzilla/show_bug.cgi?id=63701
---
 xdocs/miscellaneous/changelog.xml | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index 9a89667..0b64cee 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -1,4 +1,4 @@
-
+This will have been

[Bug 63701] SSL initialize hangs with OpenSSL 1.1.1

2020-04-22 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=63701

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #4 from Mark Thomas  ---
This will have been tested by Gump with all current OpenSSL versions so I am
sure all is well.

I've updated the changelog for 1.2.24

-- 
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 64309] Improve repository regular expression performance used for bootstrapping Catalina

2020-04-22 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=64309

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #2 from Mark Thomas  ---
Fixed in:
- master for 10.0.0-M5 onwards
- 9.0.x for 9.0.35 onwards
- 8.5.x for 8.5.55 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: Improve Catalina class loader repositories regular expression

2020-04-22 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 8fbc654  Improve Catalina class loader repositories regular expression
8fbc654 is described below

commit 8fbc654b9a8c1b8943c3b16add342104ccd7b19a
Author: Paul Muriel Biya-Bi 
AuthorDate: Tue Apr 7 10:20:15 2020 -0400

Improve Catalina class loader repositories regular expression

The goal of this enhancement is to improve the regular expression used
for searching class loader repositories when bootstrapping Catalina.

With the Java regular expression engine which is regex-directed, we
gain in performance by using the negated character class [^\"]* rather
than the lazy quantifier .*? in the regular expression used for
searching class loader repositories when bootstrapping Catalina.

https://bz.apache.org/bugzilla/show_bug.cgi?id=64309
---
 java/org/apache/catalina/startup/Bootstrap.java | 2 +-
 webapps/docs/changelog.xml  | 5 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/startup/Bootstrap.java 
b/java/org/apache/catalina/startup/Bootstrap.java
index d3f25a5..1497e41 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -59,7 +59,7 @@ public final class Bootstrap {
 private static final File catalinaBaseFile;
 private static final File catalinaHomeFile;
 
-private static final Pattern PATH_PATTERN = 
Pattern.compile("(\".*?\")|(([^,])*)");
+private static final Pattern PATH_PATTERN = 
Pattern.compile("(\"[^\"]*\")|(([^,])*)");
 
 static {
 // Will always be non-null
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4a29e3f..039009a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -73,6 +73,11 @@
 Add more descriptive error message in DefaultServlet for SC_NOT_FOUND.
 (michaelo)
   
+  
+64309; Improve the regular expression used to search for
+class loader repositories when bootstrapping Tomcat. Pull request
+provided by Paul Muriel Biya-Bi. (markt)
+  
 
   
   


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

[tomcat] branch master updated (ddcc3dd -> 9344187)

2020-04-22 Thread markt

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 ddcc3dd  Add more descriptive error messages in 
DefaultServlet/JspServlet for SC_NOT_FOUND
 add 9344187  Improve Catalina class loader repositories regular expression

No new revisions were added by this update.

Summary of changes:
 java/org/apache/catalina/startup/Bootstrap.java | 2 +-
 webapps/docs/changelog.xml  | 5 +
 2 files changed, 6 insertions(+), 1 deletion(-)


-
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: Add chnagelog entry for BZ 64309

2020-04-22 Thread markt

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 a8c19dd  Add chnagelog entry for BZ 64309
a8c19dd is described below

commit a8c190f34ecf663ac2b07c8e496816406f4e
Author: Mark Thomas 
AuthorDate: Wed Apr 22 10:32:57 2020 +0100

Add chnagelog entry for BZ 64309

https://bz.apache.org/bugzilla/show_bug.cgi?id=64309
---
 webapps/docs/changelog.xml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f27be5a..2877555 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -71,6 +71,11 @@
 Add more descriptive error message in DefaultServlet for SC_NOT_FOUND.
 (michaelo)
   
+  
+64309; Improve the regular expression used to search for
+class loader repositories when bootstrapping Tomcat. Pull request
+provided by Paul Muriel Biya-Bi. (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: Improve Catalina class loader repositories regular expression

2020-04-22 Thread markt

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 67f0aec  Improve Catalina class loader repositories regular expression
67f0aec is described below

commit 67f0aecbfcf835e0a5e08ab20fc75cabad126f32
Author: Paul Muriel Biya-Bi 
AuthorDate: Tue Apr 7 10:20:15 2020 -0400

Improve Catalina class loader repositories regular expression

The goal of this enhancement is to improve the regular expression used
for searching class loader repositories when bootstrapping Catalina.

With the Java regular expression engine which is regex-directed, we
gain in performance by using the negated character class [^\"]* rather
than the lazy quantifier .*? in the regular expression used for
searching class loader repositories when bootstrapping Catalina.
---
 java/org/apache/catalina/startup/Bootstrap.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/startup/Bootstrap.java 
b/java/org/apache/catalina/startup/Bootstrap.java
index 08ad013..90e3c98 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -59,7 +59,7 @@ public final class Bootstrap {
 private static final File catalinaBaseFile;
 private static final File catalinaHomeFile;
 
-private static final Pattern PATH_PATTERN = 
Pattern.compile("(\".*?\")|(([^,])*)");
+private static final Pattern PATH_PATTERN = 
Pattern.compile("(\"[^\"]*\")|(([^,])*)");
 
 static {
 // Will always be non-null


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

[GitHub] [tomcat] govi20 commented on issue #275: BZ 59203 - interrupt tomcat threads instead of stopping

2020-04-22 Thread GitBox



govi20 commented on issue #275:
URL: https://github.com/apache/tomcat/pull/275#issuecomment-617662936


   @markt-asf could you please suggest if any further changes are required here.



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] rmaucher commented on issue #277: Refuse adding invalid HTTP 2.0 headers

2020-04-22 Thread GitBox



rmaucher commented on issue #277:
URL: https://github.com/apache/tomcat/pull/277#issuecomment-617661025


   The initial post says SHOULD, but after actually checking the spec it is a 
MUST.
   https://tools.ietf.org/html/rfc7540#section-8.1.2.2
   
   It is really odd the specification made such a choice given how many 
applications toy with that header in an attempt to do something useful, and 
given they have no idea if they're using HTTP/1.1 or HTTP/2. So this looks to 
me like a spec mistake [for compatibility, they should have said it has to be 
ignored and can be freely removed, whatever], and it is not very surprising 
most HTTP/2 clients would not check this requirement.



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 commented on issue #279: Optimize concurrency

2020-04-22 Thread GitBox



markt-asf commented on issue #279:
URL: https://github.com/apache/tomcat/pull/279#issuecomment-617654855


   Your analysis is not correct.



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] martin-g commented on a change in pull request #276: Add s390x Travis support

2020-04-22 Thread GitBox



martin-g commented on a change in pull request #276:
URL: https://github.com/apache/tomcat/pull/276#discussion_r412708978



##
File path: .travis.yml
##
@@ -15,8 +15,12 @@
 
 dist: bionic
 language: java
-jdk: oraclejdk8
-arch: arm64
+jobs:
+include:
+  - arch: s390x
+jdk: openjdk11

Review comment:
   My concern is that Tomcat (even version 10.x) is supposed to be build 
with JDK 8. 
   But since Travis is not the main CI I think it is OK to use JDK 11 as an 
exception here.





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] prankkelkar commented on a change in pull request #276: Add s390x Travis support

2020-04-22 Thread GitBox



prankkelkar commented on a change in pull request #276:
URL: https://github.com/apache/tomcat/pull/276#discussion_r412706114



##
File path: .travis.yml
##
@@ -15,8 +15,12 @@
 
 dist: bionic
 language: java
-jdk: oraclejdk8
-arch: arm64
+jobs:
+include:
+  - arch: s390x
+jdk: openjdk11

Review comment:
   JDK8 is very slow for s390x and causes test case failures due to timeout.





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] prankkelkar commented on a change in pull request #276: Add s390x Travis support

2020-04-22 Thread GitBox



prankkelkar commented on a change in pull request #276:
URL: https://github.com/apache/tomcat/pull/276#discussion_r412705684



##
File path: .travis.yml
##
@@ -32,14 +36,7 @@ addons:
 - libtool-bin
 
 install:
-- ARCH=`uname -p`
-- echo $ARCH
-- 
JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz;
-- 
JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u232b09.tar.gz;
-- if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; else 
JDK_URL=$JDK_X64; fi
-- wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz
-- mv jdk8* jdk
-- export JAVA_HOME=`pwd`/jdk

Review comment:
   I had shifted to use travis jdk to make things cleaner. Also since the 
version was exactly same i thought the steps were redundant. I will revert 
since you want keep it the way it is.





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

62 matches

Mail list logo