You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/11/06 13:07:24 UTC
[tomcat] branch 7.0.x updated (0f9f305 -> f77075a)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 0f9f305 Fix PR #211 via POEditor
new 5fd4cf5 Fix typo
new f77075a 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: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Remove unnecessary code
Posted by ma...@apache.org.
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
commit f77075a3320aa0f322a4c736d25c76a344f30218
Author: Mark Thomas <ma...@apache.org>
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 8a70250..be7e7e5 100644
--- a/java/org/apache/catalina/core/StandardWrapperValve.java
+++ b/java/org/apache/catalina/core/StandardWrapperValve.java
@@ -475,7 +475,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: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Fix typo
Posted by ma...@apache.org.
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
commit 5fd4cf5fbcc2a6fda5c091602168fdcb15e0f8a1
Author: 康智冬 <wo...@gmail.com>
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 e758e90..d3eb103 100644
--- a/java/org/apache/catalina/tribes/group/GroupChannel.java
+++ b/java/org/apache/catalina/tribes/group/GroupChannel.java
@@ -125,7 +125,7 @@ public class GroupChannel extends ChannelInterceptorBase implements ManagedChann
* <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 -> C -> B</code><br>
* The complete stack will look like this:<br>
* <code>Channel -> A -> C -> B -> ChannelCoordinator</code><br>
diff --git a/java/org/apache/tomcat/util/buf/package.html b/java/org/apache/tomcat/util/buf/package.html
index 61f2c38..03c97d5 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: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org