Author: aogburn Date: 2013-08-16 12:38:20 -0400 (Fri, 16 Aug 2013) New Revision: 2250 Modified: branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846/ branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846/build.xml branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846/java/org/apache/tomcat/util/net/JIoEndpoint.java Log: [JBPAPP-10846] merge fix Property changes on: branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846 ___________________________________________________________________ Added: svn:mergeinfo + /branches/2.1.x:2248 Modified: branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846/build.xml =================================================================== --- branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846/build.xml 2013-08-16 16:13:27 UTC (rev 2249) +++ branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846/build.xml 2013-08-16 16:38:20 UTC (rev 2250) @@ -843,7 +843,7 @@ <target name="build-jasper-jdt-src"> <jar destfile="${jasper-jdt-src.jar}" index="true"> - <fileset dir="${jasper-jdt-src.home}/src/plugins/org.eclipse.jdt.core/model"> + <fileset dir="${jasper-jdt-src.home}/plugins/org.eclipse.jdt.core/model"> <include name="org/eclipse/jdt/core/compiler/**"/> <include name="org/eclipse/jdt/internal/compiler/**"/> <include name="org/eclipse/jdt/internal/core/util/CommentRecorder*"/> Modified: branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846/java/org/apache/tomcat/util/net/JIoEndpoint.java =================================================================== --- branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846/java/org/apache/tomcat/util/net/JIoEndpoint.java 2013-08-16 16:13:27 UTC (rev 2249) +++ branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846/java/org/apache/tomcat/util/net/JIoEndpoint.java 2013-08-16 16:38:20 UTC (rev 2250) @@ -20,6 +20,7 @@ import java.io.IOException; import java.net.BindException; import java.net.InetAddress; +import java.net.InetSocketAddress; import java.net.ServerSocket; import java.net.Socket; import java.util.concurrent.Executor; @@ -586,17 +587,18 @@ * Unlock the accept by using a local connection. */ protected void unlockAccept() { - Socket s = null; + java.net.Socket s = null; + InetSocketAddress saddr = null; try { // Need to create a connection to unlock the accept(); if (address == null) { - s = new Socket("localhost", port); + saddr = new InetSocketAddress("localhost", port); } else { - s = new Socket(address, port); - // setting soLinger to a small value will help shutdown the - // connection quicker - s.setSoLinger(true, 0); + saddr = new InetSocketAddress(address, port); } + s = new java.net.Socket(); + s.setSoLinger(true, 0); + s.connect(saddr, 2000); } catch (Exception e) { if (log.isDebugEnabled()) { log.debug(sm.getString("endpoint.debug.unlock", "" + port), e); Property changes on: branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846/java/org/apache/tomcat/util/net/JIoEndpoint.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/2.1.x/java/org/apache/tomcat/util/net/JIoEndpoint.java:2248 /branches/7.2.x/src/main/java/org/apache/tomcat/util/net/JIoEndpoint.java:2135