Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch #65

This commit is contained in:
Martyn Taylor 2015-01-16 12:06:45 +00:00
parent 475f2322e2 e3656db93d
commit f99a018a24
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java
View File

@ -593,11 +593,14 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
ArrayList<String> bindingsToAdd = new ArrayList<String>();
for (String bindingsItem : bindings)
if (bindings != null)
{
if (bindToBindings(bindingsItem, destination))
for (String bindingsItem : bindings)
{
bindingsToAdd.add(bindingsItem);
if (bindToBindings(bindingsItem, destination))
{
bindingsToAdd.add(bindingsItem);
}
}
}

28
activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java
View File

@ -120,7 +120,7 @@ public class ActiveMQBootstrap
securityConfiguration = new SecurityConfiguration();
}
createServer(configuration);
createServer(configuration, jmsFileConfiguration);
if (waitOnStart)
{
@ -168,7 +168,7 @@ public class ActiveMQBootstrap
}
}
private void createServer(Configuration configuration) throws Exception
private void createServer(Configuration configuration, JMSConfiguration jmsFileConfiguration) throws Exception
{
if (nodeId != null && !nodeId.equals("") && !nodeId.equals("null"))
{
@ -188,7 +188,7 @@ public class ActiveMQBootstrap
securityManager != null ? securityManager : new ActiveMQSecurityManagerImpl(securityConfiguration));
}
manager = new JMSServerManagerImpl(server);
manager = new JMSServerManagerImpl(server, jmsFileConfiguration);
manager.start();
}
@ -243,20 +243,12 @@ public class ActiveMQBootstrap
{
try
{
if (!spawned)
{
manager.getActiveMQServer()
.stop(true);
manager.stop();
manager = null;
server = null;
killFile.delete();
}
else
{
killFile.delete();
Runtime.getRuntime().halt(777);
}
manager.getActiveMQServer()
.stop(true);
manager.stop();
manager = null;
server = null;
killFile.delete();
}
catch (Exception e)
{
@ -267,7 +259,7 @@ public class ActiveMQBootstrap
{
try
{
createServer(configuration);
createServer(configuration, jmsFileConfiguration);
restartFile.delete();
}
catch (Exception e)