You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2006/11/07 18:16:28 UTC
svn commit: r472173 - in /incubator/qpid/trunk/qpid/java/client:
src/org/apache/qpid/client/transport/TransportConnection.java
test/src/org/apache/qpid/failover/FailoverBrokerTester.java
Author: ritchiem
Date: Tue Nov 7 09:16:25 2006
New Revision: 472173
URL: http://svn.apache.org/viewvc?view=rev&rev=472173
Log:
Set AutoCreateInVMBroker to false.
Modified:
incubator/qpid/trunk/qpid/java/client/src/org/apache/qpid/client/transport/TransportConnection.java
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java
Modified: incubator/qpid/trunk/qpid/java/client/src/org/apache/qpid/client/transport/TransportConnection.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/org/apache/qpid/client/transport/TransportConnection.java?view=diff&rev=472173&r1=472172&r2=472173
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/org/apache/qpid/client/transport/TransportConnection.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/org/apache/qpid/client/transport/TransportConnection.java Tue Nov 7 09:16:25 2006
@@ -137,7 +137,7 @@
break;
case VM:
{
- _instance = getVMTransport(details, Boolean.getBoolean("amqj.NoAutoCreateVMBroker"));
+ _instance = getVMTransport(details, Boolean.getBoolean("amqj.AutoCreateVMBroker"));
break;
}
}
@@ -160,19 +160,19 @@
return -1;
}
- private static ITransportConnection getVMTransport(BrokerDetails details, boolean noAutoCreate) throws AMQVMBrokerCreationException
+ private static ITransportConnection getVMTransport(BrokerDetails details, boolean AutoCreate) throws AMQVMBrokerCreationException
{
int port = details.getPort();
if (!_inVmPipeAddress.containsKey(port))
{
- if (noAutoCreate)
+ if (AutoCreate)
{
- throw new AMQVMBrokerCreationException(port, "VM Broker on port " + port + " does not exist. Auto create disabled.");
+ createVMBroker(port);
}
else
{
- createVMBroker(port);
+ throw new AMQVMBrokerCreationException(port, "VM Broker on port " + port + " does not exist. Auto create disabled.");
}
}
@@ -208,7 +208,14 @@
{
VmPipeAddress pipe = new VmPipeAddress(port);
- _acceptor.unbind(pipe);
+ try
+ {
+ _acceptor.unbind(pipe);
+ }
+ catch (Exception ignore)
+ {
+ //ignore
+ }
if (provider == null)
{
@@ -258,14 +265,7 @@
Object[] params = {port};
provider = (IoHandlerAdapter) Class.forName(protocolProviderClass).getConstructor(cnstr).newInstance(params);
//Give the broker a second to create
- try
- {
- Thread.sleep(1000);
- }
- catch (InterruptedException e)
- {
- //do nothing
- }
+ _logger.info("Created Instance");
}
catch (Exception e)
{
@@ -309,8 +309,8 @@
if (pipe != null)
{
_logger.info("Killing VM Broker:" + port);
- _acceptor.unbind(pipe);
_inVmPipeAddress.remove(port);
+ _acceptor.unbind(pipe);
}
}
Modified: incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java?view=diff&rev=472173&r1=472172&r2=472173
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java (original)
+++ incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java Tue Nov 7 09:16:25 2006
@@ -129,8 +129,6 @@
private void createWorld()
{
- System.setProperty("amqj.NoAutoCreateVMBroker", "true");
-
genesis();
Thread brokerGod = new Thread(this);