From 64174598087c84545aa0185f04445a4b49b17f4c Mon Sep 17 00:00:00 2001
From: Rui Gu <jackygurui@gmail.com>
Date: Thu, 20 Apr 2017 23:06:40 +0100
Subject: [PATCH] I should use File.separator for directory separation in path
---
redisson/src/test/java/org/redisson/ClusterRunner.java | 2 +-
redisson/src/test/java/org/redisson/RedisRunner.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/redisson/src/test/java/org/redisson/ClusterRunner.java b/redisson/src/test/java/org/redisson/ClusterRunner.java
index abca5b170..c02d58ea8 100644
--- a/redisson/src/test/java/org/redisson/ClusterRunner.java
+++ b/redisson/src/test/java/org/redisson/ClusterRunner.java
@@ -50,7 +50,7 @@ public class ClusterRunner {
ArrayList<RedisRunner.RedisProcess> processes = new ArrayList<>();
for (RedisRunner runner : nodes.keySet()) {
List<String> options = getClusterConfig(runner);
- String confFile = runner.dir() + File.separatorChar + nodes.get(runner) + ".conf";
+ String confFile = runner.dir() + File.separator + nodes.get(runner) + ".conf";
System.out.println("WRITING CONFIG: for " + nodes.get(runner));
try (PrintWriter printer = new PrintWriter(new FileWriter(confFile))) {
options.stream().forEach((line) -> {
diff --git a/redisson/src/test/java/org/redisson/RedisRunner.java b/redisson/src/test/java/org/redisson/RedisRunner.java
index 5499bd5ad..1571057e2 100644
--- a/redisson/src/test/java/org/redisson/RedisRunner.java
+++ b/redisson/src/test/java/org/redisson/RedisRunner.java
@@ -272,7 +272,7 @@ public class RedisRunner {
public RedisProcess runAndCheck() throws IOException, InterruptedException, FailedToStartRedisException {
List<String> args = new ArrayList(options.values());
if (sentinelFile != null && sentinelFile.length() > 0) {
- String confFile = defaultDir + File.pathSeparator + sentinelFile;
+ String confFile = defaultDir + File.separator + sentinelFile;
try (PrintWriter printer = new PrintWriter(new FileWriter(confFile))) {
args.stream().forEach((arg) -> {
if (arg.contains("--")) {
@@ -845,7 +845,7 @@ public class RedisRunner {
}
public boolean deleteSentinelFile() {
- File f = new File(defaultDir + File.pathSeparator + sentinelFile);
+ File f = new File(defaultDir + File.separator + sentinelFile);
if (f.exists()) {
System.out.println("REDIS RUNNER: Deleting sentinel config file " + f.getAbsolutePath());
return f.delete();
@@ -863,7 +863,7 @@ public class RedisRunner {
}
private void makeRandomDefaultDir() {
- File f = new File(RedissonRuntimeEnvironment.tempDir + File.pathSeparator + UUID.randomUUID());
+ File f = new File(RedissonRuntimeEnvironment.tempDir + File.separator + UUID.randomUUID());
if (f.exists()) {
makeRandomDefaultDir();
} else {