Skip to content

[7.x.x] Fix some small issues with config paths on Windows #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamretter merged 2 commits into from
Jun 3, 2026
Merged

[7.x.x] Fix some small issues with config paths on Windows #216

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
576bd0f
[bugfix] Fix an issue with spaces in Windows file paths when locating…
adamretter May 23, 2026
2da9127
[bugfix] Normalise Log4j2 config path to file: URI for cross-platform…
Laurettta Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 33 additions & 3 deletions exist-start/src/main/java/org/exist/start/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,11 @@ public void runEx(String[] args) throws StartException {
if (existHomeDir.isPresent() && Files.exists(existHomeDir.get().resolve(CONFIG_DIR_NAME))) {
log4jConfigurationFile = existHomeDir.map(f -> f.resolve(CONFIG_DIR_NAME).resolve("log4j2.xml"));
}
}

if (log4jConfigurationFile.isPresent() && Files.isReadable(log4jConfigurationFile.get())) {
System.setProperty(PROP_LOG4J_CONFIGURATION_FILE, log4jConfigurationFile.get().toAbsolutePath().toString());
}
// Always normalise to a file:/ URI so log4j can resolve it on all platforms (especially Windows)
if (log4jConfigurationFile.isPresent() && Files.isReadable(log4jConfigurationFile.get())) {
System.setProperty(PROP_LOG4J_CONFIGURATION_FILE, log4jConfigurationFile.get().toAbsolutePath().toUri().toString());
}

if (log4jConfigurationFile.isPresent()) {
Expand Down Expand Up @@ -319,6 +320,7 @@ public void runEx(String[] args) throws StartException {
Thread.currentThread().setContextClassLoader(cl);

// Invoke main class using new classloader.
args = cleanupArgs(args);
try {
invokeMain(cl, _classname, args);
} catch (final Exception e) {
Expand All @@ -327,6 +329,34 @@ public void runEx(String[] args) throws StartException {
}
}

public static String[] cleanupArgs(final String[] args) {
if (args == null) {
return null;
}
if (args.length == 0) {
return args;
}

final String[] nargs = new String[args.length];
for (int i = 0; i < args.length; i++) {
String arg = args[i];

if (arg.startsWith("\"") && arg.indexOf('\"', 1) > -1 && (arg.endsWith("conf.xml") || arg.endsWith("log4j2.xml"))) {
// String that starts with quote, has a quote somewhere in it, and ends with conf.xml or log4j2.xml - such invalid strings can be produced by startup.bat on Windows
arg = arg.replaceAll("\"", "");
}

if (arg.indexOf('\\') != -1 && arg.indexOf('\\') < arg.indexOf('/') && (arg.endsWith("conf.xml") || arg.endsWith("log4j2.xml"))) {
// String that contains both '\' path separators followed by `/` path separators, and ends with conf.xml or log4j2.xml - such invalid strings can be produced by startup.bat on Windows
arg = arg.replaceAll("/", "\\\\");
}

nargs[i] = arg;
}

return nargs;
}

private Optional<String> getFromSysPropOrEnv(final String sysPropName, final String envVarName) {
Optional<String> value = Optional.ofNullable(System.getProperty(sysPropName));
if (!value.isPresent()) {
Expand Down
Loading