date:20220916

Re: [tomcat] branch main updated: Refactor to avoid use of Hashtable. No functional change.

2022-09-16 Thread Mark Thomas


On 15/09/2022 22:37, Christopher Schultz wrote:

Mark,

On 9/15/22 11:26, Mark Thomas wrote:

On 15/09/2022 16:23, ma...@apache.org wrote:

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

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


The following commit(s) were added to refs/heads/main by this push:
  new 00cf721f14 Refactor to avoid use of Hashtable. No 
functional change.

00cf721f14 is described below

commit 00cf721f14ac90e7ebc372a5303603ca408fc999
Author: Mark Thomas 
AuthorDate: Thu Sep 15 16:23:49 2022 +0100

 Refactor to avoid use of Hashtable. No functional change.


Any objections to back-porting this?

It changes some protected API for the CGIServlet inner classes (and 
the CGI Servlet is final). That seems pretty low risk to me.


I haven't read through the whole class, but is there any risk of 
multi-threaded access?


I don't believe so.


At what point is "shellEnv" stable?


Servlet initialisation.


Can it be wrapped in Collections.unmodifiableMap() at any point?


It could at the end of init(ServletConfig).


Can that be added to any other instances of Map<> usage in this class?


Yes.

I'm in two minds whether to use Collections.unmodifiableMap(). It makes 
the intended usage clearer (good) but it isn't necessary (bad) since the 
Maps aren't exposed to applications.


Mark

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

[tomcat] branch main updated: No need for LinkedList here - use ArrayList

2022-09-16 Thread markt

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 35e6259cd3 No need for LinkedList here - use ArrayList
35e6259cd3 is described below

commit 35e6259cd3f9c42bd0f68f5d0cc4ffca7f337f7e
Author: Mark Thomas 
AuthorDate: Fri Sep 16 09:22:47 2022 +0100

No need for LinkedList here - use ArrayList
---
 java/org/apache/tomcat/buildutil/CheckEol.java  | 3 +--
 java/org/apache/tomcat/buildutil/RepeatableArchive.java | 4 ++--
 java/org/apache/tomcat/buildutil/Txt2Html.java  | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/tomcat/buildutil/CheckEol.java 
b/java/org/apache/tomcat/buildutil/CheckEol.java
index f9b98399c8..35851963d0 100644
--- a/java/org/apache/tomcat/buildutil/CheckEol.java
+++ b/java/org/apache/tomcat/buildutil/CheckEol.java
@@ -21,7 +21,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 
 import org.apache.tools.ant.BuildException;
@@ -42,7 +41,7 @@ import org.apache.tools.ant.types.FileSet;
 public class CheckEol extends Task {
 
 /** The files to be checked */
-private final List filesets = new LinkedList<>();
+private final List filesets = new ArrayList<>();
 
 /** The line ending mode (either LF, CRLF, or null for OS specific) */
 private Mode mode;
diff --git a/java/org/apache/tomcat/buildutil/RepeatableArchive.java 
b/java/org/apache/tomcat/buildutil/RepeatableArchive.java
index a6442f8138..f94c26e32a 100644
--- a/java/org/apache/tomcat/buildutil/RepeatableArchive.java
+++ b/java/org/apache/tomcat/buildutil/RepeatableArchive.java
@@ -25,9 +25,9 @@ import java.nio.file.StandardCopyOption;
 import java.nio.file.attribute.FileTime;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.Enumeration;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -49,7 +49,7 @@ import org.apache.tools.ant.types.FileSet;
  */
 public class RepeatableArchive extends Task {
 
-private final List filesets = new LinkedList<>();
+private final List filesets = new ArrayList<>();
 
 private String datetime;
 private String pattern;
diff --git a/java/org/apache/tomcat/buildutil/Txt2Html.java 
b/java/org/apache/tomcat/buildutil/Txt2Html.java
index 8375fc86ba..42e4b95d58 100644
--- a/java/org/apache/tomcat/buildutil/Txt2Html.java
+++ b/java/org/apache/tomcat/buildutil/Txt2Html.java
@@ -24,7 +24,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.tools.ant.BuildException;
@@ -50,7 +50,7 @@ public class Txt2Html
 private File todir;
 
 /** The file to be converted into HTML */
-private final List filesets = new LinkedList<>();
+private final List filesets = new ArrayList<>();
 
 /**
  * The encoding of the source files (.java and .jsp).  Once they use


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

[tomcat] branch 10.0.x updated: No need for LinkedList here - use ArrayList

2022-09-16 Thread markt

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new baf78ce9ce No need for LinkedList here - use ArrayList
baf78ce9ce is described below

commit baf78ce9ce9bf1741be007bfcb00098b96a4ddc0
Author: Mark Thomas 
AuthorDate: Fri Sep 16 09:22:47 2022 +0100

No need for LinkedList here - use ArrayList
---
 java/org/apache/tomcat/buildutil/CheckEol.java  | 3 +--
 java/org/apache/tomcat/buildutil/RepeatableArchive.java | 4 ++--
 java/org/apache/tomcat/buildutil/Txt2Html.java  | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/tomcat/buildutil/CheckEol.java 
b/java/org/apache/tomcat/buildutil/CheckEol.java
index f9b98399c8..35851963d0 100644
--- a/java/org/apache/tomcat/buildutil/CheckEol.java
+++ b/java/org/apache/tomcat/buildutil/CheckEol.java
@@ -21,7 +21,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 
 import org.apache.tools.ant.BuildException;
@@ -42,7 +41,7 @@ import org.apache.tools.ant.types.FileSet;
 public class CheckEol extends Task {
 
 /** The files to be checked */
-private final List filesets = new LinkedList<>();
+private final List filesets = new ArrayList<>();
 
 /** The line ending mode (either LF, CRLF, or null for OS specific) */
 private Mode mode;
diff --git a/java/org/apache/tomcat/buildutil/RepeatableArchive.java 
b/java/org/apache/tomcat/buildutil/RepeatableArchive.java
index a6442f8138..f94c26e32a 100644
--- a/java/org/apache/tomcat/buildutil/RepeatableArchive.java
+++ b/java/org/apache/tomcat/buildutil/RepeatableArchive.java
@@ -25,9 +25,9 @@ import java.nio.file.StandardCopyOption;
 import java.nio.file.attribute.FileTime;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.Enumeration;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -49,7 +49,7 @@ import org.apache.tools.ant.types.FileSet;
  */
 public class RepeatableArchive extends Task {
 
-private final List filesets = new LinkedList<>();
+private final List filesets = new ArrayList<>();
 
 private String datetime;
 private String pattern;
diff --git a/java/org/apache/tomcat/buildutil/Txt2Html.java 
b/java/org/apache/tomcat/buildutil/Txt2Html.java
index 8375fc86ba..42e4b95d58 100644
--- a/java/org/apache/tomcat/buildutil/Txt2Html.java
+++ b/java/org/apache/tomcat/buildutil/Txt2Html.java
@@ -24,7 +24,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.tools.ant.BuildException;
@@ -50,7 +50,7 @@ public class Txt2Html
 private File todir;
 
 /** The file to be converted into HTML */
-private final List filesets = new LinkedList<>();
+private final List filesets = new ArrayList<>();
 
 /**
  * The encoding of the source files (.java and .jsp).  Once they use


-
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: No need for LinkedList here - use ArrayList

2022-09-16 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 50b6c147f0 No need for LinkedList here - use ArrayList
50b6c147f0 is described below

commit 50b6c147f0485f68ea2787994187b8148b83b601
Author: Mark Thomas 
AuthorDate: Fri Sep 16 09:22:47 2022 +0100

No need for LinkedList here - use ArrayList
---
 java/org/apache/tomcat/buildutil/CheckEol.java  | 3 +--
 java/org/apache/tomcat/buildutil/RepeatableArchive.java | 4 ++--
 java/org/apache/tomcat/buildutil/Txt2Html.java  | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/tomcat/buildutil/CheckEol.java 
b/java/org/apache/tomcat/buildutil/CheckEol.java
index f9b98399c8..35851963d0 100644
--- a/java/org/apache/tomcat/buildutil/CheckEol.java
+++ b/java/org/apache/tomcat/buildutil/CheckEol.java
@@ -21,7 +21,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 
 import org.apache.tools.ant.BuildException;
@@ -42,7 +41,7 @@ import org.apache.tools.ant.types.FileSet;
 public class CheckEol extends Task {
 
 /** The files to be checked */
-private final List filesets = new LinkedList<>();
+private final List filesets = new ArrayList<>();
 
 /** The line ending mode (either LF, CRLF, or null for OS specific) */
 private Mode mode;
diff --git a/java/org/apache/tomcat/buildutil/RepeatableArchive.java 
b/java/org/apache/tomcat/buildutil/RepeatableArchive.java
index a6442f8138..f94c26e32a 100644
--- a/java/org/apache/tomcat/buildutil/RepeatableArchive.java
+++ b/java/org/apache/tomcat/buildutil/RepeatableArchive.java
@@ -25,9 +25,9 @@ import java.nio.file.StandardCopyOption;
 import java.nio.file.attribute.FileTime;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.Enumeration;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -49,7 +49,7 @@ import org.apache.tools.ant.types.FileSet;
  */
 public class RepeatableArchive extends Task {
 
-private final List filesets = new LinkedList<>();
+private final List filesets = new ArrayList<>();
 
 private String datetime;
 private String pattern;
diff --git a/java/org/apache/tomcat/buildutil/Txt2Html.java 
b/java/org/apache/tomcat/buildutil/Txt2Html.java
index 8375fc86ba..42e4b95d58 100644
--- a/java/org/apache/tomcat/buildutil/Txt2Html.java
+++ b/java/org/apache/tomcat/buildutil/Txt2Html.java
@@ -24,7 +24,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.tools.ant.BuildException;
@@ -50,7 +50,7 @@ public class Txt2Html
 private File todir;
 
 /** The file to be converted into HTML */
-private final List filesets = new LinkedList<>();
+private final List filesets = new ArrayList<>();
 
 /**
  * The encoding of the source files (.java and .jsp).  Once they use


-
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: No need for LinkedList here - use ArrayList

2022-09-16 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 f082251b4d No need for LinkedList here - use ArrayList
f082251b4d is described below

commit f082251b4df52c9c413917cca7018a6f45f7f2a2
Author: Mark Thomas 
AuthorDate: Fri Sep 16 09:22:47 2022 +0100

No need for LinkedList here - use ArrayList
---
 java/org/apache/tomcat/buildutil/CheckEol.java  | 3 +--
 java/org/apache/tomcat/buildutil/RepeatableArchive.java | 4 ++--
 java/org/apache/tomcat/buildutil/Txt2Html.java  | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/tomcat/buildutil/CheckEol.java 
b/java/org/apache/tomcat/buildutil/CheckEol.java
index f9b98399c8..35851963d0 100644
--- a/java/org/apache/tomcat/buildutil/CheckEol.java
+++ b/java/org/apache/tomcat/buildutil/CheckEol.java
@@ -21,7 +21,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 
 import org.apache.tools.ant.BuildException;
@@ -42,7 +41,7 @@ import org.apache.tools.ant.types.FileSet;
 public class CheckEol extends Task {
 
 /** The files to be checked */
-private final List filesets = new LinkedList<>();
+private final List filesets = new ArrayList<>();
 
 /** The line ending mode (either LF, CRLF, or null for OS specific) */
 private Mode mode;
diff --git a/java/org/apache/tomcat/buildutil/RepeatableArchive.java 
b/java/org/apache/tomcat/buildutil/RepeatableArchive.java
index e17700041e..6892949c1d 100644
--- a/java/org/apache/tomcat/buildutil/RepeatableArchive.java
+++ b/java/org/apache/tomcat/buildutil/RepeatableArchive.java
@@ -25,9 +25,9 @@ import java.nio.file.StandardCopyOption;
 import java.nio.file.attribute.FileTime;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.Enumeration;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -49,7 +49,7 @@ import org.apache.tools.ant.types.FileSet;
  */
 public class RepeatableArchive extends Task {
 
-private final List filesets = new LinkedList<>();
+private final List filesets = new ArrayList<>();
 
 private String datetime;
 private String pattern;
diff --git a/java/org/apache/tomcat/buildutil/Txt2Html.java 
b/java/org/apache/tomcat/buildutil/Txt2Html.java
index 8375fc86ba..42e4b95d58 100644
--- a/java/org/apache/tomcat/buildutil/Txt2Html.java
+++ b/java/org/apache/tomcat/buildutil/Txt2Html.java
@@ -24,7 +24,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.tools.ant.BuildException;
@@ -50,7 +50,7 @@ public class Txt2Html
 private File todir;
 
 /** The file to be converted into HTML */
-private final List filesets = new LinkedList<>();
+private final List filesets = new ArrayList<>();
 
 /**
  * The encoding of the source files (.java and .jsp).  Once they use


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

Re: [VOTE] Apache Tomcat migration tool for Jakarta EE 1.0.4

2022-09-16 Thread Mark Thomas


On 15/09/2022 10:06, Mark Thomas wrote:

The proposed Apache Tomcat migration tool for Jakarta EE 1.0.4 is now
available for voting.

The significant changes since 1.0.3 are:

- Issue #26 - Re-fix
- PR #28 - Add Jakarta EE -. Java EE profile (with warnings)
- Add checkstyle

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.4/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1392/

The tag is:
https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.4
a74aad315b8af81de0fa1837acc2adb278f5cb5a

The proposed 1.0.4 release is:

[ ] -1: Broken. Do not release because...
[X] +1: Acceptable. Go ahead and release.


Mark

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

Re: [tomcat] branch main updated: Refactor to avoid use of Hashtable. No functional change.

[tomcat] branch main updated: No need for LinkedList here - use ArrayList

[tomcat] branch 10.0.x updated: No need for LinkedList here - use ArrayList

[tomcat] branch 9.0.x updated: No need for LinkedList here - use ArrayList

[tomcat] branch 8.5.x updated: No need for LinkedList here - use ArrayList

Re: [VOTE] Apache Tomcat migration tool for Jakarta EE 1.0.4

6 matches

Site Navigation

Mail list logo

Footer information