Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

close socket in a separate thread and only await stopLatch 

for 2 seconds - as it close could be called by InactivityMonitor

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@605671 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Davies 2007-12-19 19:50:11 +00:00
parent 3318a9f0e3
commit 8228663f6d
1 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java
View File

@ -30,6 +30,10 @@ import java.net.UnknownHostException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import javax.net.SocketFactory; import javax.net.SocketFactory;
@ -50,7 +54,7 @@ import org.apache.commons.logging.LogFactory;
*/ */
public class TcpTransport extends TransportThreadSupport implements Transport, Service, Runnable { public class TcpTransport extends TransportThreadSupport implements Transport, Service, Runnable {
private static final Log LOG = LogFactory.getLog(TcpTransport.class); private static final Log LOG = LogFactory.getLog(TcpTransport.class);
private static final ThreadPoolExecutor SOCKET_CLOSE;
protected final URI remoteLocation; protected final URI remoteLocation;
protected final URI localLocation; protected final URI localLocation;
protected final WireFormat wireFormat; protected final WireFormat wireFormat;
@ -427,7 +431,23 @@ public class TcpTransport extends TransportThreadSupport implements Transport, S
// is hung.. then this hangs the close. // is hung.. then this hangs the close.
// closeStreams(); // closeStreams();
if (socket != null) { if (socket != null) {
socket.close(); //closing the socket can hang also
final CountDownLatch latch = new CountDownLatch(1);
SOCKET_CLOSE.execute(new Runnable() {
public void run() {
try {
socket.close();
} catch (IOException e) {
LOG.debug("Caught exception closing socket",e);
}finally {
latch.countDown();
}
}
});
latch.await(1,TimeUnit.SECONDS);
} }
} }
@ -439,7 +459,7 @@ public class TcpTransport extends TransportThreadSupport implements Transport, S
super.stop(); super.stop();
CountDownLatch countDownLatch = stoppedLatch.get(); CountDownLatch countDownLatch = stoppedLatch.get();
if (countDownLatch != null && Thread.currentThread() != this.runnerThread) { if (countDownLatch != null && Thread.currentThread() != this.runnerThread) {
countDownLatch.await(); countDownLatch.await(1,TimeUnit.SECONDS);
} }
} }
@ -478,4 +498,13 @@ public class TcpTransport extends TransportThreadSupport implements Transport, S
return super.narrow(target); return super.narrow(target);
} }
static {
SOCKET_CLOSE = new ThreadPoolExecutor(0, Integer.MAX_VALUE, 10, TimeUnit.SECONDS, new SynchronousQueue<Runnable>(), new ThreadFactory() {
public Thread newThread(Runnable runnable) {
Thread thread = new Thread(runnable, "TcpSocketClose: "+runnable);
thread.setDaemon(true);
return thread;
}
});
}
} }