Version 4.09

Bug fix for config.xml load
C4J · Jul 2, 2023 · 157f108 · 157f108
1 parent 55ec152
commit 157f108
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/b5Middleware/b5middleware.install4j b/b5Middleware/b5middleware.install4j
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="10.0.6" transformSequenceNumber="10">
   <directoryPresets config="./xslt/referenceData.xml" />
-  <application name="Commander4j Middleware" applicationId="1915-8055-3520-8512" mediaDir="../../../Distribution/java11/b5middleware4j" compression="9" shortName="c4jMiddleware" publisher="David Garratt" publisherWeb="http://www.commander4j.com" version="4.08" allPathsRelative="true" macVolumeId="ebde9226275d23ed" javaMinVersion="11" javaMaxVersion="11">
+  <application name="Commander4j Middleware" applicationId="1915-8055-3520-8512" mediaDir="../../../Distribution/java11/b5middleware4j" compression="9" shortName="c4jMiddleware" publisher="David Garratt" publisherWeb="http://www.commander4j.com" version="4.09" allPathsRelative="true" macVolumeId="ebde9226275d23ed" javaMinVersion="11" javaMaxVersion="11">
     <languages skipLanguageSelection="true">
       <additionalLanguages>
         <language id="da" />

diff --git a/b5Middleware/c4jMiddleware.jar b/b5Middleware/c4jMiddleware.jar
diff --git a/b5Middleware/src/com/commander4j/mw/StartMain.java b/b5Middleware/src/com/commander4j/mw/StartMain.java
@@ -16,7 +16,7 @@ public class StartMain
 
 	Logger logger = org.apache.logging.log4j.LogManager.getLogger((StartMain.class));
 	public MiddlewareConfig cfg;
-	public static String version = "4.08";
+	public static String version = "4.09";
 	Boolean running = false;
 	LogArchiveThread archiveLog;
 	StatusThread statusthread;

diff --git a/b5Middleware/src/com/commander4j/sys/MiddlewareConfig.java b/b5Middleware/src/com/commander4j/sys/MiddlewareConfig.java
@@ -216,10 +216,15 @@ public LinkedList<Map> loadMaps(String filename)
 
 				int outputSeq = 1;
 
-				while (doc.findXPath("/config/map[" + String.valueOf(mapSeq) + "]/output[" + String.valueOf(outputSeq) + "]/@enabed").trim() != "")
+				while (doc.findXPath("/config/map[" + String.valueOf(mapSeq) + "]/output[" + String.valueOf(outputSeq) + "]/@id").trim() != "")
 				{
 
-					String outputEnabled = doc.findXPath("/config/map[" + String.valueOf(mapSeq) + "]/output[" + String.valueOf(outputSeq) + "]/@enabed").trim();
+					String outputEnabled = util.replaceNullStringwithBlank(doc.findXPath("/config/map[" + String.valueOf(mapSeq) + "]/output[" + String.valueOf(outputSeq) + "]/@enabed").trim());
+
+					if (outputEnabled.equals(""))
+					{
+						outputEnabled = util.replaceNullStringwithBlank(doc.findXPath("/config/map[" + String.valueOf(mapSeq) + "]/output[" + String.valueOf(outputSeq) + "]/@enabled").trim());
+					}
 
 					if (outputEnabled.toUpperCase().equals("Y"))
 					{