[tomcat] branch master updated (2f4e1f2 -> d3b4844)

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

[tomcat] branch master updated (2f4e1f2 -> d3b4844)

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 2f4e1f2  Fix PR #211 via POEditor
     new 8ce7933  Fix typo
     new 31ebf2f  Fix typo
     new d8e336d  Fix typo
     new d3b4844  Remove redundant method for clean

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


Summary of changes:
 java/javax/servlet/AsyncContext.java                    | 2 +-
 java/org/apache/catalina/core/StandardWrapperValve.java | 1 -
 java/org/apache/catalina/tribes/group/GroupChannel.java | 2 +-
 java/org/apache/tomcat/util/buf/package.html            | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)


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

Reply | Threaded
Open this post in threaded view
|

[tomcat] 01/04: Fix typo

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

commit 8ce79338f3c5eea8d4a43ef1bcb548685f774628
Author: 康智冬 <[hidden email]>
AuthorDate: Mon Oct 14 13:19:41 2019 +0800

    Fix typo
   
    fix typo
---
 java/org/apache/catalina/tribes/group/GroupChannel.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/tribes/group/GroupChannel.java b/java/org/apache/catalina/tribes/group/GroupChannel.java
index 64137c1..6177938 100644
--- a/java/org/apache/catalina/tribes/group/GroupChannel.java
+++ b/java/org/apache/catalina/tribes/group/GroupChannel.java
@@ -166,7 +166,7 @@ public class GroupChannel extends ChannelInterceptorBase
      * <code>channel.addInterceptor(A);</code><br>
      * <code>channel.addInterceptor(C);</code><br>
      * <code>channel.addInterceptor(B);</code><br>
-     * Will result in a interceptor stack like this:<br>
+     * Will result in an interceptor stack like this:<br>
      * <code>A -&gt; C -&gt; B</code><br>
      * The complete stack will look like this:<br>
      * <code>Channel -&gt; A -&gt; C -&gt; B -&gt; ChannelCoordinator</code><br>


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

Reply | Threaded
Open this post in threaded view
|

[tomcat] 02/04: Fix typo

markt
In reply to this post by 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

commit 31ebf2f75149eb0494007dc26057157b932ce001
Author: 康智冬 <[hidden email]>
AuthorDate: Tue Oct 15 01:02:51 2019 +0800

    Fix typo
---
 java/javax/servlet/AsyncContext.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/javax/servlet/AsyncContext.java b/java/javax/servlet/AsyncContext.java
index dd61fad..9d0c81d 100644
--- a/java/javax/servlet/AsyncContext.java
+++ b/java/javax/servlet/AsyncContext.java
@@ -100,7 +100,7 @@ public interface AsyncContext {
     void setTimeout(long timeout);
 
     /**
-     * Get the current.
+     * Get the current timeout.
      *
      * @return The timeout in milliseconds. 0 or less indicates no timeout.
      */


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

Reply | Threaded
Open this post in threaded view
|

[tomcat] 03/04: Fix typo

markt
In reply to this post by 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

commit d8e336de2ca766b2984cca5876ff6851a13e6fcf
Author: 康智冬 <[hidden email]>
AuthorDate: Sat Oct 19 18:01:08 2019 +0800

    Fix typo
   
    fix typo
---
 java/org/apache/tomcat/util/buf/package.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/buf/package.html b/java/org/apache/tomcat/util/buf/package.html
index 718dc1c..e61b9b3 100644
--- a/java/org/apache/tomcat/util/buf/package.html
+++ b/java/org/apache/tomcat/util/buf/package.html
@@ -22,7 +22,7 @@ conversions, URL encodings, etc.
 
 <p>
 Encoding is a critical operation for performance. There are few tricks in this package - the C2B and
-B2C converters are caching a ISReader/OSWriter and keep everything allocated to do the conversions
+B2C converters are caching an ISReader/OSWriter and keep everything allocated to do the conversions
 in any VM without any garbage.
 
 <p>


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

Reply | Threaded
Open this post in threaded view
|

[tomcat] 04/04: Remove redundant method for clean

markt
In reply to this post by 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

commit d3b4844d07b76fdf8cd2ff7d28a6f6fe21ea0596
Author: 康智冬 <[hidden email]>
AuthorDate: Mon Oct 21 01:25:16 2019 +0800

    Remove redundant method for clean
---
 java/org/apache/catalina/core/StandardWrapperValve.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/catalina/core/StandardWrapperValve.java b/java/org/apache/catalina/core/StandardWrapperValve.java
index f8b0703..8d2f54b 100644
--- a/java/org/apache/catalina/core/StandardWrapperValve.java
+++ b/java/org/apache/catalina/core/StandardWrapperValve.java
@@ -288,7 +288,6 @@ final class StandardWrapperValve
                 container.getLogger().error(sm.getString("standardWrapper.unloadException",
                                  wrapper.getName()), e);
                 if (throwable == null) {
-                    throwable = e;
                     exception(request, response, e);
                 }
             }


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