Author: violetagg
Date: Mon Oct 26 08:24:16 2015
New Revision: 1710529
URL: http://svn.apache.org/viewvc?rev=1710529&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58546
SecureNio2Channel inner class GatherState is made static. Patch provided by
Anthony Whitford.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1710529&r1=1710528&r2=1710529&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
Mon Oct 26 08:24:16 2015
@@ -858,7 +858,7 @@ public class SecureNio2Channel extends N
}
}
- private class GatherState<A> {
+ private static class GatherState<A> {
public ByteBuffer[] srcs;
public int offset;
public int length;
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1710529&r1=1710528&r2=1710529&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Oct 26 08:24:16 2015
@@ -77,8 +77,10 @@
<code>ClassNotFoundException</code> which is not permitted. (markt)
</fix>
<fix>
- <bug>58537</bug>: Some of the inner classes in
- <code>o.a.catalina.valves.ExtendedAccessLogValve</code> are made
static.
+ <bug>58537</bug>, <bug>58546</bug>: Some of the inner classes in
+ <code>o.a.catalina.valves.ExtendedAccessLogValve</code>
+ and <code>o.a.tomcat.util.net.SecureNio2Channel</code>
+ are made static.
Patch provided by Anthony Whitford. (violetagg)
</fix>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
