You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ai...@apache.org on 2008/03/20 12:29:57 UTC
svn commit: r639251 - in /incubator/qpid/branches/M2.1/java:
client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
systests/src/main/java/org/apache/qpid/test/FailoverBaseCase.java
Author: aidan
Date: Thu Mar 20 04:29:56 2008
New Revision: 639251
URL: http://svn.apache.org/viewvc?rev=639251&view=rev
Log:
QPID-854 Resynchronise the _acceptor so that we don't hang
Modified:
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/FailoverBaseCase.java
Modified: incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java?rev=639251&r1=639250&r2=639251&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java (original)
+++ incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java Thu Mar 20 04:29:56 2008
@@ -332,20 +332,17 @@
public static void killVMBroker(int port)
{
- VmPipeAddress pipe;
synchronized (_inVmPipeAddress)
{
- pipe = (VmPipeAddress) _inVmPipeAddress.get(port);
+ VmPipeAddress pipe = (VmPipeAddress) _inVmPipeAddress.get(port);
if (pipe != null)
{
_logger.info("Killing VM Broker:" + port);
_inVmPipeAddress.remove(port);
+ // This does need to be sychronized as otherwise mina can hang
+ // if a new connection is made
+ _acceptor.unbind(pipe);
}
- }
- //This doesn't need to be sychronized
- if (pipe != null)
- {
- _acceptor.unbind(pipe);
}
}
Modified: incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/FailoverBaseCase.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/FailoverBaseCase.java?rev=639251&r1=639250&r2=639251&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/FailoverBaseCase.java (original)
+++ incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/FailoverBaseCase.java Thu Mar 20 04:29:56 2008
@@ -37,7 +37,7 @@
public void setUp() throws Exception
{
// Make Broker 2 the first one so we can kill it and allow VMTestCase to clean up vm://:1
- _brokerlist = "vm://:2?connectdelay='150';vm://:1?connectdelay='150'";
+ _brokerlist = "vm://:2;vm://:1";
_clientID = this.getClass().getName();
_virtualhost = "/test";