From 202df0618c5ba7c58a0e4ef8e4f9ac76c8a32a46 Mon Sep 17 00:00:00 2001
From: norman <norman@apache.org>
Date: Wed, 2 May 2012 07:39:02 +0200
Subject: [PATCH] Remove workaround for ipv6 link-localaddresses as it not work
 on most os / jdk versions. See #267 and #295

---
 .../netty/channel/socket/nio/NioClientSocketPipelineSink.java | 3 ---
 .../netty/channel/socket/oio/OioClientSocketPipelineSink.java | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioClientSocketPipelineSink.java b/transport/src/main/java/io/netty/channel/socket/nio/NioClientSocketPipelineSink.java
index 6b4008a520..495dd371fb 100644
--- a/transport/src/main/java/io/netty/channel/socket/nio/NioClientSocketPipelineSink.java
+++ b/transport/src/main/java/io/netty/channel/socket/nio/NioClientSocketPipelineSink.java
@@ -27,9 +27,7 @@ import io.netty.channel.ChannelStateEvent;
 import io.netty.channel.MessageEvent;
 import io.netty.logging.InternalLogger;
 import io.netty.logging.InternalLoggerFactory;
-import io.netty.util.internal.SocketUtil;
 
-import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.nio.channels.ClosedChannelException;
 
@@ -101,7 +99,6 @@ class NioClientSocketPipelineSink extends AbstractNioChannelSink {
             final NioClientSocketChannel channel, final ChannelFuture cf,
             SocketAddress remoteAddress) {
         try {
-            remoteAddress = SocketUtil.stripZoneId((InetSocketAddress) remoteAddress);
             channel.getJdkChannel().connect(remoteAddress);
             channel.getCloseFuture().addListener(new ChannelFutureListener() {
                 @Override
diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioClientSocketPipelineSink.java b/transport/src/main/java/io/netty/channel/socket/oio/OioClientSocketPipelineSink.java
index ea5148b76b..e607d3282e 100644
--- a/transport/src/main/java/io/netty/channel/socket/oio/OioClientSocketPipelineSink.java
+++ b/transport/src/main/java/io/netty/channel/socket/oio/OioClientSocketPipelineSink.java
@@ -18,7 +18,6 @@ package io.netty.channel.socket.oio;
 import static io.netty.channel.Channels.*;
 
 import java.io.PushbackInputStream;
-import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.concurrent.Executor;
 
@@ -30,7 +29,6 @@ import io.netty.channel.ChannelState;
 import io.netty.channel.ChannelStateEvent;
 import io.netty.channel.MessageEvent;
 import io.netty.util.internal.DeadLockProofWorker;
-import io.netty.util.internal.SocketUtil;
 
 class OioClientSocketPipelineSink extends AbstractOioChannelSink {
 
@@ -104,8 +102,6 @@ class OioClientSocketPipelineSink extends AbstractOioChannelSink {
         future.addListener(ChannelFutureListener.CLOSE_ON_FAILURE);
 
         try {
-            remoteAddress = SocketUtil.stripZoneId((InetSocketAddress) remoteAddress);
-
             channel.socket.connect(
                     remoteAddress, channel.getConfig().getConnectTimeoutMillis());
             connected = true;