Author: kwall
Date: Fri Oct 3 10:29:53 2014
New Revision: 1629177
URL: http://svn.apache.org/r1629177
Log:
QPID-6131: [Java Broker] Mark virtualhosts that are being closed as UNAVAILABLE
to prevent any new messaging connections being established
Modified:
qpid/trunk/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
Modified:
qpid/trunk/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java?rev=1629177&r1=1629176&r2=1629177&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
Fri Oct 3 10:29:53 2014
@@ -166,8 +166,8 @@ public class MultiNodeTest extends QpidB
// New connections should now fail as vhost will be unavailable
try
{
- getConnection(_negativeFailoverUrl);
- fail("Exception not thrown");
+ Connection unexpectedConnection =
getConnection(_negativeFailoverUrl);
+ fail("Got unexpected connection to node in group without quorum "
+ unexpectedConnection);
}
catch (JMSException je)
{
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1629177&r1=1629176&r2=1629177&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
Fri Oct 3 10:29:53 2014
@@ -678,6 +678,7 @@ public abstract class AbstractVirtualHos
protected void onClose()
{
+ setState(State.UNAVAILABLE);
//Stop Connections
_connectionRegistry.close();
_dtxRegistry.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
