Skip to content

Commit 83208f7

Browse files
author
Summer
authored
hotfix: Escape paths used as java parameter (#141)
1 parent 92d4b76 commit 83208f7

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@
88
* Run war package on Tomcat Server
99
* Debug war package on Tomcat Server
1010
* Open server page in browser to check all deployed war packages
11+
* View all deployed war packages in Tomcat Explorer
1112
* Open war package page in browser
1213
* Stop Tomcat Server
1314
* Rename Tomcat Server
15+
* Customize JVM Options when starting Tomcat Server
16+
* Reveal deployed war packages in explorer
17+
* Delete deployed war package
1418

1519
## Prerequisites
1620
* [Apache Tomcat](http://tomcat.apache.org/)

src/Tomcat/TomcatModel.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ export class TomcatModel {
3939
public async updateJVMOptions(serverName: string) : Promise<void> {
4040
const server: TomcatServer = this.getTomcatServer(serverName);
4141
const installPath: string = server.getInstallPath();
42-
const catalinaBase: string = path.join(server.getStoragePath());
42+
const catalinaBase: string = server.getStoragePath();
4343
const bootStrap: string = path.join(installPath, 'bin', 'bootstrap.jar');
4444
const tomcat: string = path.join(installPath, 'bin', 'tomcat-juli.jar');
4545
let result: string[] = [
46-
`${Constants.CLASS_PATH_KEY} ${[bootStrap, tomcat].join(path.delimiter)}`,
47-
`${Constants.CATALINA_BASE_KEY}=${catalinaBase}`,
48-
`${Constants.CATALINA_HOME_KEY}=${installPath}`,
46+
`${Constants.CLASS_PATH_KEY} "${[bootStrap, tomcat].join(path.delimiter)}"`,
47+
`${Constants.CATALINA_BASE_KEY}="${catalinaBase}"`,
48+
`${Constants.CATALINA_HOME_KEY}="${installPath}"`,
4949
`${Constants.ENCODING}`
5050
];
5151

@@ -73,7 +73,7 @@ export class TomcatModel {
7373
return element.indexOf(Constants.JAVA_IO_TEMP_DIR_KEY) >= 0;
7474
});
7575
if (!tmpDirConfiguration || tmpDirConfiguration.length <= 0) {
76-
result = result.concat(`${Constants.JAVA_IO_TEMP_DIR_KEY}=${path.join(catalinaBase, 'temp')}`);
76+
result = result.concat(`${Constants.JAVA_IO_TEMP_DIR_KEY}="${path.join(catalinaBase, 'temp')}"`);
7777
}
7878
server.jvmOptions = result.concat([Constants.BOOTSTRAP_FILE, '"$@"']);
7979
resolve();

0 commit comments

Comments
 (0)