mirror of https://github.com/apache/activemq.git
applied patch for http://issues.apache.org/activemq/browse/AMQ-1029
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/branches/activemq-4.0@478063 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
7ca2db3f92
commit
69fab89c1e
|
@ -1071,9 +1071,18 @@ public class BrokerService implements Service, Serializable {
|
||||||
*/
|
*/
|
||||||
protected void startAllConnectors() throws Exception{
|
protected void startAllConnectors() throws Exception{
|
||||||
if (!isSlave()){
|
if (!isSlave()){
|
||||||
|
|
||||||
|
ArrayList al = new ArrayList();
|
||||||
|
|
||||||
for (Iterator iter = getTransportConnectors().iterator(); iter.hasNext();) {
|
for (Iterator iter = getTransportConnectors().iterator(); iter.hasNext();) {
|
||||||
TransportConnector connector = (TransportConnector) iter.next();
|
TransportConnector connector = (TransportConnector) iter.next();
|
||||||
startTransportConnector(connector);
|
al.add(startTransportConnector(connector));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (al.size()>0) {
|
||||||
|
//let's clear the transportConnectors list and replace it with the started transportConnector instances
|
||||||
|
this.transportConnectors.clear();
|
||||||
|
setTransportConnectors(al);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (Iterator iter = getNetworkConnectors().iterator(); iter.hasNext();) {
|
for (Iterator iter = getNetworkConnectors().iterator(); iter.hasNext();) {
|
||||||
|
@ -1095,7 +1104,7 @@ public class BrokerService implements Service, Serializable {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void startTransportConnector(TransportConnector connector) throws Exception {
|
protected TransportConnector startTransportConnector(TransportConnector connector) throws Exception {
|
||||||
connector.setBroker(getBroker());
|
connector.setBroker(getBroker());
|
||||||
connector.setBrokerName(getBrokerName());
|
connector.setBrokerName(getBrokerName());
|
||||||
connector.setTaskRunnerFactory(getTaskRunnerFactory());
|
connector.setTaskRunnerFactory(getTaskRunnerFactory());
|
||||||
|
@ -1117,6 +1126,8 @@ public class BrokerService implements Service, Serializable {
|
||||||
registerConnectorMBean(connector, objectName);
|
registerConnectorMBean(connector, objectName);
|
||||||
}
|
}
|
||||||
connector.start();
|
connector.start();
|
||||||
|
|
||||||
|
return connector;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isDeleteAllMessagesOnStartup() {
|
public boolean isDeleteAllMessagesOnStartup() {
|
||||||
|
|
Loading…
Reference in New Issue