activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [1/2] activemq-artemis git commit: ARTEMIS-919 JMS reloader reading core queues
Date Tue, 28 Feb 2017 20:06:30 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/1.x fbdac0c97 -> 75ed0bf7b


ARTEMIS-919 JMS reloader reading core queues


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b5825240
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b5825240
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b5825240

Branch: refs/heads/1.x
Commit: b58252401702b80a8ffa67f4252803ec09ea4fc5
Parents: fbdac0c
Author: Justin Bertram <jbertram@apache.org>
Authored: Tue Feb 28 13:55:03 2017 -0600
Committer: Justin Bertram <jbertram@apache.org>
Committed: Tue Feb 28 13:55:27 2017 -0600

----------------------------------------------------------------------
 .../artemis/jms/server/impl/JMSServerManagerImpl.java    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b5825240/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
index 36b4d8b..b5bc701 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
@@ -102,6 +102,7 @@ import org.apache.activemq.artemis.utils.TypedProperties;
 import org.apache.activemq.artemis.utils.XMLUtil;
 import org.jboss.logging.Logger;
 import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
 
 /**
  * A Deployer used to create and add to Bindings queues, topics and connection
@@ -1748,11 +1749,13 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
          Element e = XMLUtil.stringToElement(xml);
 
          if (config instanceof FileJMSConfiguration) {
-            ((FileJMSConfiguration) config).parse(e, url);
-
-            JMSServerManagerImpl.this.deploy();
+            NodeList children = e.getElementsByTagName("jms");
+            //if the "jms" element exists then parse it
+            if (children.getLength() > 0) {
+               ((FileJMSConfiguration) config).parse((Element) children.item(0), url);
+               JMSServerManagerImpl.this.deploy();
+            }
          }
-
       }
    }
 


Mime
View raw message