[tomcat] branch 8.5.x updated (7b841fa -> 7890094)

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

[tomcat] branch 8.5.x updated (7b841fa -> 7890094)

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

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


    from 7b841fa  Fix PR #211 via POEditor
     new b5e740e  Fix typo
     new 7890094  Remove unnecessary code

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


Summary of changes:
 java/javax/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/02: Fix typo

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

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

    Fix typo
---
 java/javax/servlet/AsyncContext.java                    | 2 +-
 java/org/apache/catalina/tribes/group/GroupChannel.java | 2 +-
 java/org/apache/tomcat/util/buf/package.html            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/javax/servlet/AsyncContext.java b/java/javax/servlet/AsyncContext.java
index 45b3ebf..2ddc1e8 100644
--- a/java/javax/servlet/AsyncContext.java
+++ b/java/javax/servlet/AsyncContext.java
@@ -98,7 +98,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.
      */
diff --git a/java/org/apache/catalina/tribes/group/GroupChannel.java b/java/org/apache/catalina/tribes/group/GroupChannel.java
index 94759d5..e5535e7 100644
--- a/java/org/apache/catalina/tribes/group/GroupChannel.java
+++ b/java/org/apache/catalina/tribes/group/GroupChannel.java
@@ -154,7 +154,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>
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] 02/02: Remove unnecessary code

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 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 7890094f2f7871ffb31ebdf0904172e1361c345d
Author: Mark Thomas <[hidden email]>
AuthorDate: Wed Nov 6 13:06:38 2019 +0000

    Remove unnecessary code
---
 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 ae7b319..ffcba85 100644
--- a/java/org/apache/catalina/core/StandardWrapperValve.java
+++ b/java/org/apache/catalina/core/StandardWrapperValve.java
@@ -287,7 +287,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]