[tomcat] branch master updated (1b2cad4 -> 945db37)

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[tomcat] branch master updated (1b2cad4 -> 945db37)

Mark Thomas-2
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 1b2cad4  Refactor to use compile time rather than run time type checking
     new e0014f2  Add release date for 10.0.6
     new 7d5f38c  Remove unnecessary code - packageless classes are not supported
     new 945db37  Fix typos

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/jasper/compiler/Generator.java | 8 +++-----
 webapps/docs/changelog.xml                     | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 01/03: Add release date for 10.0.6

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

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

commit e0014f2b77b44aecd56c68911d28ab3344506e6c
Author: Mark Thomas <[hidden email]>
AuthorDate: Wed May 12 22:52:03 2021 +0100

    Add release date for 10.0.6
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3e66c96..1dc6671 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -126,7 +126,7 @@
     </changelog>
   </subsection>
 </section>
-<section name="Tomcat 10.0.6 (markt)" rtext="release in progress">
+<section name="Tomcat 10.0.6 (markt)" rtext="2021-05-12">
   <subsection name="Catalina">
     <changelog>
       <scode>

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 02/03: Remove unnecessary code - packageless classes are not supported

Mark Thomas-2
In reply to this post by Mark Thomas-2
This is an automated email from the ASF dual-hosted git repository.

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

commit 7d5f38c44a157cd01ad3cab67e1f4c4ea89d193d
Author: Mark Thomas <[hidden email]>
AuthorDate: Fri May 14 09:39:23 2021 +0100

    Remove unnecessary code - packageless classes are not supported
---
 java/org/apache/jasper/compiler/Generator.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index 88e460f..c3092b2 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -3610,11 +3610,9 @@ class Generator {
         // Generate package declaration
         String className = tagInfo.getTagClassName();
         int lastIndex = className.lastIndexOf('.');
-        if (lastIndex != -1) {
-            String packageName = className.substring(0, lastIndex);
-            genPreamblePackage(packageName);
-            className = className.substring(lastIndex + 1);
-        }
+        String packageName = className.substring(0, lastIndex);
+        genPreamblePackage(packageName);
+        className = className.substring(lastIndex + 1);
 
         // Generate imports
         genPreambleImports();

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 03/03: Fix typos

Mark Thomas-2
In reply to this post by Mark Thomas-2
This is an automated email from the ASF dual-hosted git repository.

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

commit 945db374e75e4925b78be67552f5b362cbfe00d7
Author: Mark Thomas <[hidden email]>
AuthorDate: Fri May 14 10:48:56 2021 +0100

    Fix typos
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1dc6671..0efc03d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -107,7 +107,7 @@
   <subsection name="Coyote">
     <changelog>
       <fix>
-        <bug>65303</bug>; Fix a possible <code>NullPointerException</code> is
+        <bug>65303</bug>: Fix a possible <code>NullPointerException</code> if
         an error occurs on an HTTP/1.1 connection being upgraded to HTTP/2 or on
         a pushed HTTP/2 stream. (markt)
       </fix>

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]