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

Remove workaround for ipv6 link-localaddresses as it not work on most os / jdk versions. See #267 and #295

Browse Source
This commit is contained in:
norman 2012-05-02 07:39:02 +02:00
parent 3edef63fa8
commit 202df0618c
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
transport/src/main/java/io/netty/channel/socket/nio/NioClientSocketPipelineSink.java
View File

@ -27,9 +27,7 @@ import io.netty.channel.ChannelStateEvent;
import io.netty.channel.MessageEvent; import io.netty.channel.MessageEvent;
import io.netty.logging.InternalLogger; import io.netty.logging.InternalLogger;
import io.netty.logging.InternalLoggerFactory; import io.netty.logging.InternalLoggerFactory;
import io.netty.util.internal.SocketUtil;
import java.net.InetSocketAddress;
import java.net.SocketAddress; import java.net.SocketAddress;
import java.nio.channels.ClosedChannelException; import java.nio.channels.ClosedChannelException;
@ -101,7 +99,6 @@ class NioClientSocketPipelineSink extends AbstractNioChannelSink {
final NioClientSocketChannel channel, final ChannelFuture cf, final NioClientSocketChannel channel, final ChannelFuture cf,
SocketAddress remoteAddress) { SocketAddress remoteAddress) {
try { try {
remoteAddress = SocketUtil.stripZoneId((InetSocketAddress) remoteAddress);
channel.getJdkChannel().connect(remoteAddress); channel.getJdkChannel().connect(remoteAddress);
channel.getCloseFuture().addListener(new ChannelFutureListener() { channel.getCloseFuture().addListener(new ChannelFutureListener() {
@Override @Override

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

@ -18,7 +18,6 @@ package io.netty.channel.socket.oio;
import static io.netty.channel.Channels.*; import static io.netty.channel.Channels.*;
import java.io.PushbackInputStream; import java.io.PushbackInputStream;
import java.net.InetSocketAddress;
import java.net.SocketAddress; import java.net.SocketAddress;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
@ -30,7 +29,6 @@ import io.netty.channel.ChannelState;
import io.netty.channel.ChannelStateEvent; import io.netty.channel.ChannelStateEvent;
import io.netty.channel.MessageEvent; import io.netty.channel.MessageEvent;
import io.netty.util.internal.DeadLockProofWorker; import io.netty.util.internal.DeadLockProofWorker;
import io.netty.util.internal.SocketUtil;
class OioClientSocketPipelineSink extends AbstractOioChannelSink { class OioClientSocketPipelineSink extends AbstractOioChannelSink {
@ -104,8 +102,6 @@ class OioClientSocketPipelineSink extends AbstractOioChannelSink {
future.addListener(ChannelFutureListener.CLOSE_ON_FAILURE); future.addListener(ChannelFutureListener.CLOSE_ON_FAILURE);
try { try {
remoteAddress = SocketUtil.stripZoneId((InetSocketAddress) remoteAddress);
channel.socket.connect( channel.socket.connect(
remoteAddress, channel.getConfig().getConnectTimeoutMillis()); remoteAddress, channel.getConfig().getConnectTimeoutMillis());
connected = true; connected = true;