Author: violetagg Date: Mon Oct 26 18:54:07 2015 New Revision: 1710676 URL: http://svn.apache.org/viewvc?rev=1710676&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58537 Some of the inner classes are made static.
Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java?rev=1710676&r1=1710675&r2=1710676&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java (original) +++ tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java Mon Oct 26 18:54:07 2015 @@ -1013,7 +1013,7 @@ public class XMLEncodingDetector { * @author Neil Graham, IBM * @author Glenn Marcy, IBM */ - private final class RewindableInputStream extends InputStream { + private static final class RewindableInputStream extends InputStream { private InputStream fInputStream; private byte[] fData; Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1710676&r1=1710675&r2=1710676&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Oct 26 18:54:07 2015 @@ -1054,7 +1054,7 @@ public class AprEndpoint extends Abstrac // ---------------------------------------------- SocketTimeouts Inner Class - public class SocketTimeouts { + public static class SocketTimeouts { protected int size; protected long[] sockets; @@ -1115,7 +1115,7 @@ public class AprEndpoint extends Abstrac // -------------------------------------------------- SocketList Inner Class - public class SocketList { + public static class SocketList { protected volatile int size; protected int pos; Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1710676&r1=1710675&r2=1710676&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Mon Oct 26 18:54:07 2015 @@ -957,7 +957,7 @@ public class Nio2Endpoint extends Abstra /** * Internal state tracker for scatter/gather operations. */ - private class OperationState<A> { + private static class OperationState<A> { private final ByteBuffer[] buffers; private final int offset; private final int length; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org