summaryrefslogtreecommitdiff
path: root/qpid/java/broker-plugins/management-jmx
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2015-03-09 17:12:14 +0000
committerKeith Wall <kwall@apache.org>2015-03-09 17:12:14 +0000
commit98faeab2840203c8e4eb4526afe0fd20a596aa28 (patch)
tree665f6493dcca389d39b0a5496ad4a0eaab160ef8 /qpid/java/broker-plugins/management-jmx
parent10b21b20fbd892d19ae64084165ec8942f864eac (diff)
downloadqpid-python-98faeab2840203c8e4eb4526afe0fd20a596aa28.tar.gz
Add sync/async varients to most ACO methods
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1665306 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/management-jmx')
-rw-r--r--qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java
index 6c962c2901..06558b9f9a 100644
--- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java
@@ -32,6 +32,8 @@ import java.util.Set;
import javax.management.InstanceAlreadyExistsException;
import javax.management.JMException;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
import org.apache.log4j.Logger;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
@@ -105,7 +107,7 @@ public class JMXManagementPluginImpl
}
@StateTransition(currentState = {State.UNINITIALIZED,State.ERRORED}, desiredState = State.ACTIVE)
- private void doStart() throws JMException, IOException
+ private ListenableFuture<Void> doStart() throws JMException, IOException
{
_allowPortActivation = true;
Broker<?> broker = getBroker();
@@ -125,7 +127,8 @@ public class JMXManagementPluginImpl
registryPort.setPortManager(this);
if(port.getState() != State.ACTIVE)
{
- port.start();
+ // TODO - RG
+ port.startAsync();
}
}
@@ -135,7 +138,7 @@ public class JMXManagementPluginImpl
connectorPort.setPortManager(this);
if(port.getState() != State.ACTIVE)
{
- port.start();
+ port.startAsync();
}
}
@@ -175,6 +178,7 @@ public class JMXManagementPluginImpl
_objectRegistry.start();
setState(State.ACTIVE);
_allowPortActivation = false;
+ return Futures.immediateFuture(null);
}
@Override