From a688f9212e9aacaad95c155c7fb1b0dce4699a72 Mon Sep 17 00:00:00 2001
From: norman <norman@apache.org>
Date: Wed, 2 May 2012 07:35:35 +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/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java
index 2a20569bf1..543b1ea148 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java
@@ -19,7 +19,6 @@ import static org.jboss.netty.channel.Channels.*;
 
 import java.io.IOException;
 import java.net.ConnectException;
-import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.nio.channels.ClosedChannelException;
 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.internal.DeadLockProofWorker;
 import org.jboss.netty.util.internal.QueueFactory;
-import org.jboss.netty.util.internal.SocketUtil;
 
 class NioClientSocketPipelineSink extends AbstractNioChannelSink {
 
@@ -138,7 +136,6 @@ class NioClientSocketPipelineSink extends AbstractNioChannelSink {
             final NioClientSocketChannel channel, final ChannelFuture cf,
             SocketAddress remoteAddress) {
         try {
-            remoteAddress = SocketUtil.stripZoneId((InetSocketAddress) remoteAddress);
             if (channel.channel.connect(remoteAddress)) {
                 channel.worker.register(channel, cf);
             } else {
diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketPipelineSink.java
index 8fe4d157d2..44d1754ca1 100644
--- a/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketPipelineSink.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketPipelineSink.java
@@ -18,7 +18,6 @@ package org.jboss.netty.channel.socket.oio;
 import static org.jboss.netty.channel.Channels.*;
 
 import java.io.PushbackInputStream;
-import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 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.util.ThreadRenamingRunnable;
 import org.jboss.netty.util.internal.DeadLockProofWorker;
-import org.jboss.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;