Merge branch 'release/12.5.1'

iitsoftware · Aug 29, 2022 · 8f6968f · 8f6968f
2 parents 1f71ecd + ae72c58
commit 8f6968f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
   <groupId>com.swiftmq</groupId>
   <artifactId>swiftmq-client</artifactId>
-  <version>12.5.0</version>
+  <version>12.5.1</version>
 
   <name>SwiftMQ Client</name>
   <description>Client for SwiftMQ Messaging System with JMS, AMQP 1.0 and file transfer over JMS.</description>

diff --git a/src/main/java/com/swiftmq/mgmt/XMLUtilities.java b/src/main/java/com/swiftmq/mgmt/XMLUtilities.java
@@ -550,7 +550,7 @@ private static void fillAttributes(Element node, Entity entity, boolean addName)
         }
     }
 
-    private static void entityToXML(Element parent, String tagName, Entity entity, boolean addName) throws Exception {
+    public static void entityToXML(Element parent, String tagName, Entity entity, boolean addName) throws Exception {
         Element node = DocumentHelper.createElement(addName ? tagName : entity.getName());
         fillAttributes(node, entity, addName);
         Map m = entity.getEntities();

diff --git a/src/main/java/com/swiftmq/swiftlet/SwiftletManager.java b/src/main/java/com/swiftmq/swiftlet/SwiftletManager.java
@@ -414,6 +414,7 @@ public synchronized void loadExtensionSwiftlet(Bundle bundle) throws Exception {
         swiftlet.setStartupTime(startupTime);
         swiftletTable.put(name, swiftlet);
         swiftlet = null;
+        saveConfiguration();
         trace("loadExtensionSwiftlet: '" + name + "' DONE.");
     }
 
@@ -981,9 +982,8 @@ protected String[] saveConfiguration(RouterConfigInstance entity) {
             Map configs = entity.getEntities();
             for (Object o : configs.keySet()) {
                 Entity c = (Entity) configs.get((String) o);
-                if (c instanceof Configuration) {
+                if (c instanceof Configuration)
                     XMLUtilities.configToXML((Configuration) c, root);
-                }
             }
             XMLUtilities.writeDocument(doc, configFilename);
             al.add("Configuration saved to file '" + configFilename + "'.");