andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unnecessary empty lines

Browse Source
This commit is contained in:
Trustin Lee 2012-12-03 19:58:13 +09:00
parent 32f2122e64
commit 33c0c89fef
65 changed files with 10 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buffer/src/main/java/io/netty/buffer/DefaultCompositeByteBuf.java
View File

@ -94,7 +94,6 @@ public class DefaultCompositeByteBuf extends AbstractByteBuf implements Composit
addComponents0(0, buffers);
consolidateIfNeeded();
setIndex(0, capacity());
}
@Override
@ -174,7 +173,6 @@ public class DefaultCompositeByteBuf extends AbstractByteBuf implements Composit
throw new NullPointerException("buffers");
}
int readableBytes = 0;
for (ByteBuf b: buffers) {
if (b == null) {
@ -250,7 +248,6 @@ public class DefaultCompositeByteBuf extends AbstractByteBuf implements Composit
return addComponents0(cIndex, list.toArray(new ByteBuf[list.size()]));
}
/**
* This should only be called as last operation from a method as this may adjust the underlying
* array of components and so affect the index etc.
@ -1389,7 +1386,6 @@ public class DefaultCompositeByteBuf extends AbstractByteBuf implements Composit
return (CompositeByteBuf) super.setBytes(index, src);
}
@Override
public CompositeByteBuf setZero(int index, int length) {
return (CompositeByteBuf) super.setZero(index, length);

1
codec-http/src/main/java/io/netty/handler/codec/http/CookieDecoder.java
View File

@ -124,7 +124,6 @@ public final class CookieDecoder {
System.currentTimeMillis();
maxAge = maxAgeMillis / 1000 + (maxAgeMillis % 1000 != 0? 1 : 0);
} catch (ParseException e) {
// Ignore.
}

1
codec-http/src/main/java/io/netty/handler/codec/http/HttpContentEncoder.java
View File

@ -170,7 +170,6 @@ public abstract class HttpContentEncoder extends MessageToMessageCodec<HttpMessa
*/
protected abstract Result beginEncode(HttpMessage msg, String acceptEncoding) throws Exception;
@Override
public void afterRemove(ChannelHandlerContext ctx) throws Exception {
cleanup();

3
codec-http/src/main/java/io/netty/handler/codec/http/HttpHeaders.java
View File

@ -477,7 +477,6 @@ public class HttpHeaders {
}
}
/**
* Returns {@code true} if and only if the connection can remain open and
* thus 'kept alive'. This methods respects the value of the
@ -725,7 +724,6 @@ public class HttpHeaders {
} else {
message.setHeader(name, null);
}
}
/**
@ -862,7 +860,6 @@ public class HttpHeaders {
message.setHeader(Names.HOST, value);
}
/**
* Returns the value of the {@code "Date"} header.
*

4
codec-http/src/main/java/io/netty/handler/codec/http/HttpMessageDecoder.java
View File

@ -412,7 +412,6 @@ public abstract class HttpMessageDecoder extends ReplayingDecoder<Object, HttpMe
default: {
throw new Error("Shouldn't reach here.");
}
}
}
@ -510,7 +509,6 @@ public abstract class HttpMessageDecoder extends ReplayingDecoder<Object, HttpMe
return reset();
}
/**
* Try to do an optimized "read" of len from the given {@link ByteBuf}.
*
@ -644,7 +642,6 @@ public abstract class HttpMessageDecoder extends ReplayingDecoder<Object, HttpMe
throw new TooLongFrameException(
"HTTP header is larger than " +
maxHeaderSize + " bytes.");
}
sb.append(nextByte);
@ -658,7 +655,6 @@ public abstract class HttpMessageDecoder extends ReplayingDecoder<Object, HttpMe
protected abstract HttpMessage createMessage(String[] initialLine) throws Exception;
protected abstract HttpMessage createInvalidMessage();
private static int getChunkSize(String hex) {
hex = hex.trim();
for (int i = 0; i < hex.length(); i ++) {

1
codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java
View File

@ -169,7 +169,6 @@ public class QueryStringDecoder {
this.uri = newUri.replace(';', '&');
this.charset = charset;
this.maxParams = maxParams;
}
/**

1
codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostBodyUtil.java
View File

@ -120,7 +120,6 @@ final class HttpPostBodyUtil {
private HttpPostBodyUtil() {
}
/**
* Exception when NO Backend Array is found
*/

3
codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestDecoder.java
View File

@ -2016,10 +2016,7 @@ public class HttpPostRequestDecoder {
* Exception when the body is fully decoded, even if there is still data
*/
public static class EndOfDataDecoderException extends Exception {
/**
*/
private static final long serialVersionUID = 1336267941020800769L;
}
/**

1
codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestEncoder.java
View File

@ -555,7 +555,6 @@ public class HttpPostRequestEncoder implements ChunkedMessageInput<HttpChunk> {
internal.addValue(HttpPostBodyUtil.CONTENT_DISPOSITION + ": " + HttpPostBodyUtil.FILE + "; "
+ HttpPostBodyUtil.FILENAME + "=\"" + encodeAttribute(fileUpload.getFilename(), charset)
+ "\"\r\n");
} else {
internal.addValue("--" + multipartDataBoundary + "\r\n");
// Content-Disposition: form-data; name="files";

2
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker00.java
View File

@ -68,7 +68,6 @@ public class WebSocketClientHandshaker00 extends WebSocketClientHandshaker {
public WebSocketClientHandshaker00(URI webSocketURL, WebSocketVersion version, String subprotocol,
Map<String, String> customHeaders, int maxFramePayloadLength) {
super(webSocketURL, version, subprotocol, customHeaders, maxFramePayloadLength);
}
/**
@ -163,7 +162,6 @@ public class WebSocketClientHandshaker00 extends WebSocketClientHandshaker {
request.addHeader(Names.SEC_WEBSOCKET_PROTOCOL, expectedSubprotocol);
}
if (customHeaders != null) {
for (Map.Entry<String, String> e : customHeaders.entrySet()) {
request.addHeader(e.getKey(), e.getValue());

6
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java
View File

@ -15,8 +15,6 @@
*/
package io.netty.handler.codec.http.websocketx;
import static io.netty.handler.codec.http.HttpHeaders.Values.*;
import static io.netty.handler.codec.http.HttpVersion.*;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener;
@ -33,6 +31,9 @@ import io.netty.logging.InternalLogger;
import io.netty.logging.InternalLoggerFactory;
import io.netty.util.CharsetUtil;
import static io.netty.handler.codec.http.HttpHeaders.Values.*;
import static io.netty.handler.codec.http.HttpVersion.*;
/**
* <p>
* Performs server side opening and closing handshakes for web socket specification version <a
@ -143,7 +144,6 @@ public class WebSocketServerHandshaker08 extends WebSocketServerHandshaker {
}
}
ChannelFuture future = channel.write(res);
// Upgrade the connection and send the handshake response.

6
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java
View File

@ -15,8 +15,6 @@
*/
package io.netty.handler.codec.http.websocketx;
import static io.netty.handler.codec.http.HttpHeaders.Values.*;
import static io.netty.handler.codec.http.HttpVersion.*;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener;
@ -33,6 +31,9 @@ import io.netty.logging.InternalLogger;
import io.netty.logging.InternalLoggerFactory;
import io.netty.util.CharsetUtil;
import static io.netty.handler.codec.http.HttpHeaders.Values.*;
import static io.netty.handler.codec.http.HttpVersion.*;
/**
* <p>
* Performs server side opening and closing handshakes for <a href="http://tools.ietf.org/html/rfc6455">RFC 6455</a>
@ -143,7 +144,6 @@ public class WebSocketServerHandshaker13 extends WebSocketServerHandshaker {
}
}
ChannelFuture future = channel.write(res);
// Upgrade the connection and send the handshake response.

1
codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMessageDecoder.java
View File

@ -73,7 +73,6 @@ public abstract class RtspMessageDecoder extends HttpMessageDecoder {
aggregator = new EmbeddedMessageChannel(new HttpChunkAggregator(maxContentLength));
}
@Override
public Object decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Exception {
Object o = super.decode(ctx, buffer);

1
codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspResponseStatuses.java
View File

@ -260,7 +260,6 @@ public final class RtspResponseStatuses {
public static final HttpResponseStatus OPTION_NOT_SUPPORTED = new HttpResponseStatus(
551, "Option not supported");
/**
* Returns the {@link HttpResponseStatus} represented by the specified code.
* If the specified code is a standard RTSP status code, a cached instance

2
codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyCodecUtil.java
View File

@ -262,11 +262,9 @@ final class SpdyCodecUtil {
SPDY2_DICT = SPDY2_DICT_;
}
private SpdyCodecUtil() {
}
/**
* Reads a big-endian unsigned short integer from the buffer.
*/

2
codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaders.java
View File

@ -94,7 +94,6 @@ public class SpdyHeaders {
private Spdy2HttpNames() { }
}
/**
* Returns the header value with the specified header name. If there are
* more than one header value for the specified header name, the first
@ -357,7 +356,6 @@ public class SpdyHeaders {
}
}
private static final int BUCKET_SIZE = 17;
private static int hash(String name) {

1
codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpDecoder.java
View File

@ -117,7 +117,6 @@ public class SpdyHttpDecoder extends MessageToMessageDecoder<Object, HttpMessage
new DefaultSpdyRstStreamFrame(streamID, SpdyStreamStatus.PROTOCOL_ERROR);
ctx.write(spdyRstStreamFrame);
}
} else {
// SYN_STREAM frames initiated by the client are HTTP requests
try {

1
codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyOrHttpChooser.java
View File

@ -76,7 +76,6 @@ public abstract class SpdyOrHttpChooser extends ChannelHandlerAdapter implements
ctx.pipeline().remove(this);
ctx.fireInboundBufferUpdated();
}
}

3
codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySessionHandler.java
View File

@ -427,7 +427,6 @@ public class SpdySessionHandler
super.exceptionCaught(ctx, cause);
}
@Override
public void close(ChannelHandlerContext ctx, ChannelFuture future) throws Exception {
sendGoAwayFrame(ctx);
@ -541,7 +540,6 @@ public class SpdySessionHandler
ctx.nextOutboundMessageBuffer().add(partialDataFrame);
return;
} else {
// Stream is stalled -- enqueue Data frame and return
spdySession.putPendingWrite(streamID, spdyDataFrame);
@ -836,7 +834,6 @@ public class SpdySessionHandler
}
ctx.nextOutboundMessageBuffer().add(spdyDataFrame);
} else {
// We can send a partial frame
spdySession.updateSendWindowSize(streamID, -1 * newWindowSize);

1
codec-socks/src/main/java/io/netty/codec/socks/SocksCmdResponseDecoder.java
View File

@ -40,7 +40,6 @@ public class SocksCmdResponseDecoder extends ReplayingDecoder<SocksResponse, Soc
private int port;
private SocksResponse msg = SocksCommonUtils.UNKNOWN_SOCKS_RESPONSE;
public SocksCmdResponseDecoder() {
super(State.CHECK_PROTOCOL_VERSION);
}

1
codec/src/main/java/io/netty/handler/codec/DelimiterBasedFrameDecoder.java
View File

@ -187,7 +187,6 @@ public class DelimiterBasedFrameDecoder extends ByteToMessageDecoder<Object> {
this.failFast = failFast;
}
/** Returns true if the delimiters are "\n" and "\r\n". */
private static boolean isLineBased(final ByteBuf[] delimiters) {
if (delimiters.length != 2) {

1
codec/src/main/java/io/netty/handler/codec/LengthFieldBasedFrameDecoder.java
View File

@ -408,7 +408,6 @@ public class LengthFieldBasedFrameDecoder extends ByteToMessageDecoder<Object> {
fail(ctx, tooLongFrameLength);
}
}
}
/**

1
codec/src/main/java/io/netty/handler/codec/marshalling/ChannelBufferByteOutput.java
View File

@ -30,7 +30,6 @@ class ChannelBufferByteOutput implements ByteOutput {
private final ByteBuf buffer;
/**
* Create a new instance which use the given {@link ByteBuf}
*/

2
codec/src/main/java/io/netty/handler/codec/marshalling/CompatibleMarshallingEncoder.java
View File

@ -38,7 +38,6 @@ public class CompatibleMarshallingEncoder extends MessageToByteEncoder<Object> {
private final MarshallerProvider provider;
/**
* Create a new instance of the {@link CompatibleMarshallingEncoder}
*
@ -48,7 +47,6 @@ public class CompatibleMarshallingEncoder extends MessageToByteEncoder<Object> {
this.provider = provider;
}
@Override
public void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception {
Marshaller marshaller = provider.getMarshaller(ctx);

6
codec/src/main/java/io/netty/handler/codec/marshalling/MarshallingDecoder.java
View File

@ -19,11 +19,10 @@ import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
import io.netty.handler.codec.TooLongFrameException;
import java.io.StreamCorruptedException;
import org.jboss.marshalling.ByteInput;
import org.jboss.marshalling.Unmarshaller;
import java.io.StreamCorruptedException;
/**
* Decoder which MUST be used with {@link MarshallingEncoder}.
*
@ -59,7 +58,6 @@ public class MarshallingDecoder extends LengthFieldBasedFrameDecoder {
this.provider = provider;
}
@Override
public Object decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception {
ByteBuf frame = (ByteBuf) super.decode(ctx, in);

1
codec/src/main/java/io/netty/handler/codec/sctp/SctpInboundByteStreamHandler.java
View File

@ -30,7 +30,6 @@ public class SctpInboundByteStreamHandler extends ChannelInboundMessageHandlerAd
private final int protocolIdentifier;
private final int streamIdentifier;
/**
* @param streamIdentifier accepted stream number, this should be >=0 or <= max stream number of the association.
* @param protocolIdentifier supported application protocol.

1
codec/src/main/java/io/netty/handler/codec/sctp/SctpOutboundByteStreamHandler.java
View File

@ -33,7 +33,6 @@ public class SctpOutboundByteStreamHandler extends ChannelOutboundByteHandlerAda
private final int streamIdentifier;
private final int protocolIdentifier;
/**
* @param streamIdentifier stream number, this should be >=0 or <= max stream number of the association.
* @param protocolIdentifier supported application protocol id.

1
common/src/main/java/io/netty/monitor/MonitorRegistries.java
View File

@ -139,7 +139,6 @@ public final class MonitorRegistries implements Iterable<MonitorRegistry> {
public void remove() {
throw new UnsupportedOperationException("Removing a MonitorRegistry is not supported");
}
}
private MonitorRegistries() {

1
common/src/main/java/io/netty/util/HashedWheelTimer.java
View File

@ -633,7 +633,6 @@ public class HashedWheelTimer implements Timer {
"An exception was thrown by " +
TimerTask.class.getSimpleName() + '.', t);
}
}
}

1
common/src/main/java/io/netty/util/NetworkConstants.java
View File

@ -61,7 +61,6 @@ public final class NetworkConstants {
InternalLoggerFactory.getInstance(NetworkConstants.class);
static {
//Start the process of discovering localhost
InetAddress localhost;
try {

1
common/src/main/java/io/netty/util/internal/StringUtil.java
View File

@ -40,7 +40,6 @@ public final class StringUtil {
}
NEWLINE = newLine;
}
private static final String EMPTY_STRING = "";

1
example/src/main/java/io/netty/example/discard/DiscardClient.java
View File

@ -48,7 +48,6 @@ public class DiscardClient {
// Wait until the connection is closed.
f.channel().closeFuture().sync();
} finally {
b.shutdown();
}

3
example/src/main/java/io/netty/example/discard/DiscardClientHandler.java
View File

@ -43,7 +43,6 @@ public class DiscardClientHandler extends ChannelInboundByteHandlerAdapter {
content = new byte[messageSize];
}
@Override
public void channelActive(ChannelHandlerContext ctx)
throws Exception {
@ -52,7 +51,6 @@ public class DiscardClientHandler extends ChannelInboundByteHandlerAdapter {
generateTraffic();
}
@Override
public void inboundBufferUpdated(ChannelHandlerContext ctx, ByteBuf in)
throws Exception {
@ -60,7 +58,6 @@ public class DiscardClientHandler extends ChannelInboundByteHandlerAdapter {
in.clear();
}
@Override
public void exceptionCaught(ChannelHandlerContext ctx,
Throwable cause) throws Exception {

2
example/src/main/java/io/netty/example/discard/DiscardServerHandler.java
View File

@ -30,7 +30,6 @@ public class DiscardServerHandler extends ChannelInboundByteHandlerAdapter {
private static final Logger logger = Logger.getLogger(
DiscardServerHandler.class.getName());
@Override
public void inboundBufferUpdated(ChannelHandlerContext ctx, ByteBuf in)
throws Exception {
@ -38,7 +37,6 @@ public class DiscardServerHandler extends ChannelInboundByteHandlerAdapter {
in.clear();
}
@Override
public void exceptionCaught(ChannelHandlerContext ctx,
Throwable cause) throws Exception {

1
example/src/main/java/io/netty/example/factorial/FactorialClient.java
View File

@ -54,7 +54,6 @@ public class FactorialClient {
// Print out the answer.
System.err.format(
"Factorial of %,d is: %,d", count, handler.getFactorial());
} finally {
b.shutdown();
}

1
example/src/main/java/io/netty/example/factorial/FactorialClientHandler.java
View File

@ -70,7 +70,6 @@ public class FactorialClientHandler extends ChannelInboundMessageHandlerAdapter<
sendNumbers();
}
@Override
public void messageReceived(
ChannelHandlerContext ctx, final BigInteger msg) {

1
example/src/main/java/io/netty/example/http/websocketx/autobahn/AutobahnServer.java
View File

@ -43,7 +43,6 @@ public class AutobahnServer {
ChannelFuture f = b.bind().sync();
System.out.println("Web Socket Server started at port " + port);
f.channel().closeFuture().sync();
} finally {
b.shutdown();
}

1
example/src/main/java/io/netty/example/http/websocketx/client/WebSocketClient.java
View File

@ -66,7 +66,6 @@ public class WebSocketClient {
public void run() throws Exception {
Bootstrap b = new Bootstrap();
try {
String protocol = uri.getScheme();
if (!"ws".equals(protocol)) {
throw new IllegalArgumentException("Unsupported protocol: " + protocol);

1
example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java
View File

@ -87,7 +87,6 @@ public final class WebSocketSslServerSslContext {
logger.error("Error initializing SslContextManager. " + ex.getMessage(), ex);
}
System.exit(1);
} finally {
_serverContext = serverContext;
}

3
example/src/main/java/io/netty/example/localecho/LocalEcho.java
View File

@ -77,7 +77,6 @@ public class LocalEcho {
new LoggingHandler(LogLevel.INFO),
new LocalEchoClientHandler());
}
});
// Start the server.
@ -90,7 +89,7 @@ public class LocalEcho {
System.out.println("Enter text (quit to end)");
ChannelFuture lastWriteFuture = null;
BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
for (; ;) {
for (;;) {
String line = in.readLine();
if (line == null || "quit".equalsIgnoreCase(line)) {
break;

1
example/src/main/java/io/netty/example/localtime/LocalTimeServer.java
View File

@ -40,7 +40,6 @@ public class LocalTimeServer {
.childHandler(new LocalTimeServerInitializer());
b.bind().sync().channel().closeFuture().sync();
} finally {
b.shutdown();
}

2
example/src/main/java/io/netty/example/proxy/HexDumpProxyFrontendHandler.java
View File

@ -89,8 +89,6 @@ public class HexDumpProxyFrontendHandler extends ChannelInboundByteHandlerAdapte
closeOnFlush(ctx.channel());
}
/**
* Closes the specified channel after all queued write requests are flushed.
*/

1
example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentClientHandler.java
View File

@ -22,7 +22,6 @@ import io.netty.util.CharsetUtil;
public class QuoteOfTheMomentClientHandler extends ChannelInboundMessageHandlerAdapter<DatagramPacket> {
@Override
public void messageReceived(
ChannelHandlerContext ctx, DatagramPacket msg)

5
handler/src/main/java/io/netty/handler/ssl/SslHandler.java
View File

@ -344,7 +344,6 @@ public class SslHandler
return close(ctx.newFuture());
}
/**
* See {@link #close()}
@ -592,7 +591,6 @@ public class SslHandler
ctx.close();
}
return;
}
super.exceptionCaught(ctx, cause);
}
@ -616,7 +614,6 @@ public class SslHandler
return true;
}
// Inspect the StackTraceElements to see if it was a connection reset / broken pipe or not
StackTraceElement[] elements = t.getStackTrace();
for (StackTraceElement element: elements) {
@ -658,7 +655,6 @@ public class SslHandler
} catch (ClassNotFoundException e) {
// This should not happen just ignore
}
}
}
@ -1002,7 +998,6 @@ public class SslHandler
timeoutFuture = null;
}
// Close the connection if close_notify is sent in time.
flushFuture.addListener(new ChannelFutureListener() {
@Override

2
handler/src/main/java/io/netty/handler/timeout/IdleStateHandler.java
View File

@ -265,7 +265,6 @@ public class IdleStateHandler extends ChannelHandlerAdapter {
super.channelInactive(ctx);
}
@Override
public void inboundBufferUpdated(ChannelHandlerContext ctx) throws Exception {
lastReadTime = System.currentTimeMillis();
@ -370,7 +369,6 @@ public class IdleStateHandler extends ChannelHandlerAdapter {
readerIdleTimeout = ctx.executor().schedule(this, nextDelay, TimeUnit.MILLISECONDS);
}
}
}
private final class WriterIdleTimeoutTask implements Runnable {

1
handler/src/main/java/io/netty/handler/timeout/WriteTimeoutHandler.java
View File

@ -117,7 +117,6 @@ public class WriteTimeoutHandler extends ChannelOperationHandlerAdapter {
}
}
}
}, timeoutMillis, TimeUnit.MILLISECONDS);
// Cancel the scheduled timeout if the flush future is complete.

1
transport/src/main/java/io/netty/bootstrap/Bootstrap.java
View File

@ -42,7 +42,6 @@ public class Bootstrap extends AbstractBootstrap<Bootstrap> {
private static final InternalLogger logger = InternalLoggerFactory.getInstance(Bootstrap.class);
private SocketAddress remoteAddress;
/**
* The {@link SocketAddress} to connect to once the {@link #connect()} method
* is called.

1
transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java
View File

@ -223,7 +223,6 @@ public class ServerBootstrap extends AbstractBootstrap<ServerBootstrap> {
}
}
private class Acceptor
extends ChannelInboundHandlerAdapter implements ChannelInboundMessageHandler<Channel> {

2
transport/src/main/java/io/netty/channel/AbstractChannel.java
View File

@ -129,7 +129,6 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha
allChannels.remove(id());
}
});
}
@Override
@ -440,7 +439,6 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha
}
});
}
}
private void register0(ChannelFuture future) {

1
transport/src/main/java/io/netty/channel/AbstractServerChannel.java
View File

@ -64,7 +64,6 @@ public abstract class AbstractServerChannel extends AbstractChannel implements S
return null;
}
@Override
protected SocketAddress remoteAddress0() {
return null;

1
transport/src/main/java/io/netty/channel/ChannelFutureAggregator.java
View File

@ -70,7 +70,6 @@ public class ChannelFutureAggregator implements ChannelFutureListener {
}
}
}
}
}
}

2
transport/src/main/java/io/netty/channel/ChannelInboundMessageHandlerAdapter.java
View File

@ -22,7 +22,6 @@ import io.netty.buffer.Unpooled;
public abstract class ChannelInboundMessageHandlerAdapter<I>
extends ChannelInboundHandlerAdapter implements ChannelInboundMessageHandler<I> {
private final Class<?>[] acceptedMsgTypes;
protected ChannelInboundMessageHandlerAdapter(Class<?>... acceptedMsgTypes) {
@ -81,7 +80,6 @@ public abstract class ChannelInboundMessageHandlerAdapter<I>
endMessageReceived(ctx);
}
/**
* Returns {@code true} if and only if the specified message can be handled by this handler.
*

1
transport/src/main/java/io/netty/channel/ChannelOption.java
View File

@ -37,7 +37,6 @@ public class ChannelOption<T> extends UniqueName {
public static final ChannelOption<Boolean> ALLOW_HALF_CLOSURE =
new ChannelOption<Boolean>("ALLOW_HALF_CLOSURE");
public static final ChannelOption<Boolean> SO_BROADCAST =
new ChannelOption<Boolean>("SO_BROADCAST");
public static final ChannelOption<Boolean> SO_KEEPALIVE =

1
transport/src/main/java/io/netty/channel/CombinedChannelHandler.java
View File

@ -53,7 +53,6 @@ public class CombinedChannelHandler
ChannelStateHandler.class.getSimpleName() + " to get combined.");
}
if (in != null) {
throw new IllegalStateException("init() cannot be called more than once.");
}

1
transport/src/main/java/io/netty/channel/DefaultChannelFuture.java
View File

@ -480,7 +480,6 @@ public class DefaultChannelFuture extends FlushCheckpoint implements ChannelFutu
public void run() {
notifyListener(f, l);
}
});
}

3
transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
View File

@ -386,7 +386,6 @@ public class DefaultChannelPipeline implements ChannelPipeline {
});
context = oldTail;
}
} else {
if (!ctx.channel().isRegistered() || ctx.executor().inEventLoop()) {
remove0(ctx);
@ -515,7 +514,6 @@ public class DefaultChannelPipeline implements ChannelPipeline {
checkDuplicateName(newName);
addLast0(newName, tail, newTail);
return ctx.handler();
} else {
future = oldTail.executor().submit(new Runnable() {
@Override
@ -528,7 +526,6 @@ public class DefaultChannelPipeline implements ChannelPipeline {
}
});
}
} else {
boolean sameName = ctx.name().equals(newName);
if (!sameName) {

4
transport/src/main/java/io/netty/channel/socket/DefaultSctpChannelConfig.java
View File

@ -16,6 +16,7 @@
package io.netty.channel.socket;
import com.sun.nio.sctp.SctpChannel;
import com.sun.nio.sctp.SctpStandardSocketOptions;
import io.netty.channel.ChannelException;
import io.netty.channel.ChannelOption;
import io.netty.channel.DefaultChannelConfig;
@ -23,7 +24,6 @@ import io.netty.channel.DefaultChannelConfig;
import java.io.IOException;
import java.util.Map;
import com.sun.nio.sctp.SctpStandardSocketOptions;
import static io.netty.channel.ChannelOption.*;
/**
@ -47,7 +47,6 @@ public class DefaultSctpChannelConfig extends DefaultChannelConfig implements Sc
SO_RCVBUF, SO_SNDBUF, SCTP_NODELAY, SCTP_INIT_MAXSTREAMS);
}
@SuppressWarnings("unchecked")
@Override
public <T> T getOption(ChannelOption<T> option) {
@ -82,7 +81,6 @@ public class DefaultSctpChannelConfig extends DefaultChannelConfig implements Sc
return true;
}
@Override
public boolean isSctpNoDelay() {
try {

1
transport/src/main/java/io/netty/channel/socket/DefaultSctpServerChannelConfig.java
View File

@ -54,7 +54,6 @@ public class DefaultSctpServerChannelConfig extends DefaultChannelConfig impleme
ChannelOption.SO_RCVBUF, ChannelOption.SO_SNDBUF, ChannelOption.SCTP_INIT_MAXSTREAMS);
}
@SuppressWarnings("unchecked")
@Override
public <T> T getOption(ChannelOption<T> option) {

1
transport/src/main/java/io/netty/channel/socket/SctpNotificationEvent.java
View File

@ -21,7 +21,6 @@ public final class SctpNotificationEvent {
private final Notification notification;
private final Object attachment;
public SctpNotificationEvent(Notification notification, Object attachment) {
this.notification = notification;
this.attachment = attachment;

2
transport/src/main/java/io/netty/channel/socket/SctpServerChannelConfig.java
View File

@ -55,7 +55,6 @@ public interface SctpServerChannelConfig extends ChannelConfig {
*/
void setBacklog(int backlog);
/**
* Gets the <a href="http://openjdk.java.net/projects/sctp/javadoc/com/sun/nio/sctp/SctpStandardSocketOption.html">
* {@code SO_SNDBUF}</a> option.
@ -80,7 +79,6 @@ public interface SctpServerChannelConfig extends ChannelConfig {
*/
void setReceiveBufferSize(int receiveBufferSize);
/**
* Gets the <a href="http://openjdk.java.net/projects/sctp/javadoc/com/sun/nio/sctp/SctpStandardSocketOption.html">
* {@code SCTP_INIT_MAXSTREAMS}</a> option.

1
transport/src/main/java/io/netty/channel/socket/aio/AbstractAioChannel.java
View File

@ -122,7 +122,6 @@ abstract class AbstractAioChannel extends AbstractChannel {
}
}, connectTimeoutMillis, TimeUnit.MILLISECONDS);
}
} catch (Throwable t) {
future.setFailure(t);
pipeline().fireExceptionCaught(t);

2
transport/src/main/java/io/netty/channel/socket/nio/AbstractNioChannel.java
View File

@ -47,7 +47,6 @@ public abstract class AbstractNioChannel extends AbstractChannel {
public void run() {
selectionKey().interestOps(selectionKey().interestOps() & ~readInterestOp);
}
};
final Runnable resumeReadTask = new Runnable() {
@ -80,7 +79,6 @@ public abstract class AbstractNioChannel extends AbstractChannel {
logger.warn(
"Failed to close a partially initialized socket.", e2);
}
}
throw new ChannelException("Failed to enter non-blocking mode.", e);

2
transport/src/main/java/io/netty/channel/socket/nio/NioSctpChannel.java
View File

@ -84,7 +84,6 @@ public class NioSctpChannel extends AbstractNioMessageChannel implements io.nett
logger.warn(
"Failed to close a partially initialized sctp channel.", e2);
}
}
throw new ChannelException("Failed to enter non-blocking mode.", e);
@ -250,7 +249,6 @@ public class NioSctpChannel extends AbstractNioMessageChannel implements io.nett
nioData.flip();
}
final MessageInfo mi = MessageInfo.createOutgoing(association(), null, packet.getStreamIdentifier());
mi.payloadProtocolID(packet.getProtocolIdentifier());
mi.streamNumber(packet.getStreamIdentifier());

1
transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java
View File

@ -68,7 +68,6 @@ public class NioSocketChannel extends AbstractNioByteChannel implements io.netty
logger.warn(
"Failed to close a partially initialized socket.", e2);
}
}
throw new ChannelException("Failed to enter non-blocking mode.", e);

2
transport/src/main/java/io/netty/channel/socket/oio/OioSctpChannel.java
View File

@ -128,7 +128,6 @@ public class OioSctpChannel extends AbstractOioMessageChannel
} else {
return 1;
}
}
@Override
@ -145,7 +144,6 @@ public class OioSctpChannel extends AbstractOioMessageChannel
nioData.flip();
}
final MessageInfo mi = MessageInfo.createOutgoing(association(), null, packet.getStreamIdentifier());
mi.payloadProtocolID(packet.getProtocolIdentifier());
mi.streamNumber(packet.getStreamIdentifier());