Author: markt
Date: Tue Jul 5 19:20:35 2016
New Revision: 1751537
URL: http://svn.apache.org/viewvc?rev=1751537&view=rev
Log:
Align 9.0.x and 8.5.x.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1751537&r1=1751536&r2=1751537&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Tue Jul
5 19:20:35 2016
@@ -868,6 +868,7 @@ public abstract class AbstractEndpoint<S
}
}
+
public final void start() throws Exception {
if (bindState == BindState.UNBOUND) {
bind();
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=1751537&r1=1751536&r2=1751537&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue Jul 5
19:20:35 2016
@@ -610,7 +610,7 @@ public class Nio2Endpoint extends Abstra
}
};
- public Nio2SocketWrapper(Nio2Channel channel, Nio2Endpoint endpoint) {
+ public Nio2SocketWrapper(Nio2Channel channel, final Nio2Endpoint
endpoint) {
super(channel, endpoint);
socketBufferHandler = channel.getBufHandler();
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1751537&r1=1751536&r2=1751537&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Tue Jul
5 19:20:35 2016
@@ -793,8 +793,8 @@ public class SecureNio2Channel extends N
@Override
public <A> void read(final ByteBuffer dst,
- long timeout, TimeUnit unit, final A attachment,
- CompletionHandler<Integer, ? super A> handler) {
+ final long timeout, final TimeUnit unit, final A attachment,
+ final CompletionHandler<Integer, ? super A> handler) {
// Check state
if (closing || closed) {
handler.completed(Integer.valueOf(-1), attachment);
@@ -889,9 +889,9 @@ public class SecureNio2Channel extends N
}
@Override
- public <A> void read(ByteBuffer[] dsts, int offset, int length,
- long timeout, TimeUnit unit, A attachment,
- CompletionHandler<Long, ? super A> handler) {
+ public <A> void read(final ByteBuffer[] dsts, final int offset, final int
length,
+ final long timeout, final TimeUnit unit, final A attachment,
+ final CompletionHandler<Long, ? super A> handler) {
if (offset < 0 || dsts == null || (offset + length) > dsts.length) {
throw new IllegalArgumentException();
}
@@ -976,8 +976,8 @@ public class SecureNio2Channel extends N
}
@Override
- public <A> void write(ByteBuffer src, long timeout, TimeUnit unit,
- A attachment, CompletionHandler<Integer, ? super A> handler) {
+ public <A> void write(final ByteBuffer src, final long timeout, final
TimeUnit unit,
+ final A attachment, final CompletionHandler<Integer, ? super A>
handler) {
// Check state
if (closing || closed) {
handler.failed(new
IOException(sm.getString("channel.nio.ssl.closing")), attachment);
@@ -1026,9 +1026,9 @@ public class SecureNio2Channel extends N
}
@Override
- public <A> void write(ByteBuffer[] srcs, int offset, int length,
- long timeout, TimeUnit unit, A attachment,
- CompletionHandler<Long, ? super A> handler) {
+ public <A> void write(final ByteBuffer[] srcs, final int offset, final int
length,
+ final long timeout, final TimeUnit unit, final A attachment,
+ final CompletionHandler<Long, ? super A> handler) {
if ((offset < 0) || (length < 0) || (offset > srcs.length - length)) {
throw new IndexOutOfBoundsException();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
