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:35:35 +02:00
parent 49d59e36f5
commit a688f9212e
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java
View File

@ -19,7 +19,6 @@ import static org.jboss.netty.channel.Channels.*;
import java.io.IOException; import java.io.IOException;
import java.net.ConnectException; import java.net.ConnectException;
import java.net.InetSocketAddress;
import java.net.SocketAddress; import java.net.SocketAddress;
import java.nio.channels.ClosedChannelException; import java.nio.channels.ClosedChannelException;
import java.nio.channels.SelectionKey; import java.nio.channels.SelectionKey;
@ -45,7 +44,6 @@ import org.jboss.netty.logging.InternalLoggerFactory;
import org.jboss.netty.util.ThreadRenamingRunnable; import org.jboss.netty.util.ThreadRenamingRunnable;
import org.jboss.netty.util.internal.DeadLockProofWorker; import org.jboss.netty.util.internal.DeadLockProofWorker;
import org.jboss.netty.util.internal.QueueFactory; import org.jboss.netty.util.internal.QueueFactory;
import org.jboss.netty.util.internal.SocketUtil;
class NioClientSocketPipelineSink extends AbstractNioChannelSink { class NioClientSocketPipelineSink extends AbstractNioChannelSink {
@ -138,7 +136,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);
if (channel.channel.connect(remoteAddress)) { if (channel.channel.connect(remoteAddress)) {
channel.worker.register(channel, cf); channel.worker.register(channel, cf);
} else { } else {

4
src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketPipelineSink.java
View File

@ -18,7 +18,6 @@ package org.jboss.netty.channel.socket.oio;
import static org.jboss.netty.channel.Channels.*; import static org.jboss.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;
@ -31,7 +30,6 @@ import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.util.ThreadRenamingRunnable; import org.jboss.netty.util.ThreadRenamingRunnable;
import org.jboss.netty.util.internal.DeadLockProofWorker; import org.jboss.netty.util.internal.DeadLockProofWorker;
import org.jboss.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;