From 30e5e65949adfee9eea5d35cad8a51815e2557ee Mon Sep 17 00:00:00 2001 From: Matt Gill Date: Tue, 20 Nov 2018 10:17:48 +0000 Subject: [PATCH] Reverted system specific path variables. --- .../enterprise/v3/admin/cluster/CreateNodeConfigCommand.java | 2 +- .../com/sun/enterprise/v3/admin/cluster/ServerSynchronizer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeConfigCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeConfigCommand.java index 91b32980871..c22b6c19586 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeConfigCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeConfigCommand.java @@ -104,7 +104,7 @@ public void execute(AdminCommandContext context) { Map systemPropsMap = new HashMap((Map) (System.getProperties())); resolver = new TokenResolver(systemPropsMap); String resolvedInstallDir = resolver.resolve(installdir); - File actualInstallDir = new File(resolvedInstallDir + File.separatorChar + NodeUtils.LANDMARK_FILE); + File actualInstallDir = new File(resolvedInstallDir + "/" + NodeUtils.LANDMARK_FILE); if (!actualInstallDir.exists()) { report.setMessage(Strings.get("invalid.installdir", installdir)); diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ServerSynchronizer.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ServerSynchronizer.java index dacb0e6e545..f12330a2173 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ServerSynchronizer.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ServerSynchronizer.java @@ -676,6 +676,6 @@ private File fileOf(File base, String uri) throws URISyntaxException { // have to use string concatenation to combine the relative URI // with the base URI because URI.resolve() ignores the last // component of the base URI - return new File(new URI(base.toURI().toString() + File.separatorChar + uri)); + return new File(new URI(base.toURI().toString() + "/" + uri)); } }