Allow for empty string context path. (#328)

gmowhiz · web-flow · commit 2ef8f9896af8 · 2021-10-29T16:43:29.000+08:00
diff --git a/src/Tomcat/TomcatController.ts b/src/Tomcat/TomcatController.ts
@@ -371,10 +371,14 @@ export class TomcatController {
             const xml: string = fs.readFileSync(path.join(folderLocation, 'META-INF', 'context.xml'), 'utf8');
             const jsonFromXml: any = await Utility.parseXml(xml);
             if (jsonFromXml) {
-                if (jsonFromXml.Context && jsonFromXml.Context.$ && jsonFromXml.Context.$.path) {
-                    appName = this.parseContextPathToFolderName(jsonFromXml.Context.$.path);
-                } else if (jsonFromXml.context && jsonFromXml.context.$ && jsonFromXml.context.$.path) {
-                    appName = this.parseContextPathToFolderName(jsonFromXml.context.$.path);
+                if (jsonFromXml.Context && jsonFromXml.Context.$) { 
+                    if (jsonFromXml.Context.$.path != null) {
+                        appName = this.parseContextPathToFolderName(jsonFromXml.Context.$.path);
+                    }
+                } else if (jsonFromXml.context && jsonFromXml.context.$) {
+                    if (jsonFromXml.context.$.path != null) {
+                        appName = this.parseContextPathToFolderName(jsonFromXml.context.$.path);
+                    }
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -371,10 +371,14 @@ export class TomcatController {`
`371`	`371`	`const xml: string = fs.readFileSync(path.join(folderLocation, 'META-INF', 'context.xml'), 'utf8');`
`372`	`372`	`const jsonFromXml: any = await Utility.parseXml(xml);`
`373`	`373`	`if (jsonFromXml) {`
`374`		`- if (jsonFromXml.Context && jsonFromXml.Context.$ && jsonFromXml.Context.$.path) {`
`375`		`- appName = this.parseContextPathToFolderName(jsonFromXml.Context.$.path);`
`376`		`- } else if (jsonFromXml.context && jsonFromXml.context.$ && jsonFromXml.context.$.path) {`
`377`		`- appName = this.parseContextPathToFolderName(jsonFromXml.context.$.path);`
	`374`	`+ if (jsonFromXml.Context && jsonFromXml.Context.$) {`
	`375`	`+ if (jsonFromXml.Context.$.path != null) {`
	`376`	`+ appName = this.parseContextPathToFolderName(jsonFromXml.Context.$.path);`
	`377`	`+ }`
	`378`	`+ } else if (jsonFromXml.context && jsonFromXml.context.$) {`
	`379`	`+ if (jsonFromXml.context.$.path != null) {`
	`380`	`+ appName = this.parseContextPathToFolderName(jsonFromXml.context.$.path);`
	`381`	`+ }`
`378`	`382`	`}`
`379`	`383`	`}`
`380`	`384`	`}`