You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2015/08/13 16:54:03 UTC
cassandra git commit: Revert "Remove incorrect file separator in
CommitLogArchiver on Windows"
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 9a6ee93f6 -> ab1433600
Revert "Remove incorrect file separator in CommitLogArchiver on Windows"
This reverts commit 5c88651a41c55b2ee2c3b387e92b1864386df46c.
Turns out this change is both a) incorrect and b) unnecessary to fix the
snapshot tests.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ab143360
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ab143360
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ab143360
Branch: refs/heads/cassandra-2.2
Commit: ab1433600ffa4abffb8f23f9c509879a99e6253c
Parents: 9a6ee93
Author: Joshua McKenzie <jm...@apache.org>
Authored: Thu Aug 13 10:52:54 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Thu Aug 13 10:52:54 2015 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab143360/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
index c25a740..02072de 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
@@ -124,9 +124,6 @@ public class CommitLogArchiver
{
segment.waitForFinalSync();
String command = archiveCommand.replace("%name", segment.getName());
- // We need to swap out / with the os-specific separator in the event someone provided an incorrect value
- if (FBUtilities.isWindows())
- archiveCommand.replace('/', File.separatorChar);
command = command.replace("%path", segment.getPath());
exec(command);
}