Author: remy.maucherat(a)jboss.com Date: 2012-05-02 10:56:12 -0400 (Wed, 02 May 2012) New Revision: 2034 Modified: branches/7.0.x/java/org/apache/tomcat/util/net/JIoEndpoint.java branches/7.0.x/webapps/docs/changelog.xml Log: Drop fix for AS7-4566 (problem with IPv6 on shutdown on JDK 6) Modified: branches/7.0.x/java/org/apache/tomcat/util/net/JIoEndpoint.java =================================================================== --- branches/7.0.x/java/org/apache/tomcat/util/net/JIoEndpoint.java 2012-04-26 16:23:56 UTC (rev 2033) +++ branches/7.0.x/java/org/apache/tomcat/util/net/JIoEndpoint.java 2012-05-02 14:56:12 UTC (rev 2034) @@ -1078,19 +1078,7 @@ if (address == null) { s = new Socket("localhost", port); } else { - if (address instanceof Inet6Address && ((Inet6Address)address).isLinkLocalAddress()) { - /* We need to work-around a java6 bug with IPv6 */ - String addressString = address.getHostAddress(); - if (addressString.indexOf("%") != -1) { - String addressStringWithoutSuffix = addressString.substring(0, addressString.indexOf("%")); - InetAddress addressWithoutSuffix = InetAddress.getByName(addressStringWithoutSuffix); - s = new Socket (addressWithoutSuffix, port , addressWithoutSuffix, 0); - } else { - s = new Socket(address, port, address, 0); - } - } else { - s = new Socket(address, port); - } + s = new Socket(address, port); // setting soLinger to a small value will help shutdown the // connection quicker s.setSoLinger(true, 0); Modified: branches/7.0.x/webapps/docs/changelog.xml =================================================================== --- branches/7.0.x/webapps/docs/changelog.xml 2012-04-26 16:23:56 UTC (rev 2033) +++ branches/7.0.x/webapps/docs/changelog.xml 2012-05-02 14:56:12 UTC (rev 2034) @@ -25,6 +25,9 @@ <fix> <jboss-jira>AS7-4566</jboss-jira>: Add system property to configure connection timeout. (remm) </fix> + <fix> + Drop fix for <jboss-jira>AS7-4566</jboss-jira> (problem with IPv6 on shutdown on JDK 6). (remm) + </fix> </changelog> </subsection> <subsection name="Jasper">