From 7b234a46f87e6a4cf1fbd196d624c036e5870c08 Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Tue, 28 Apr 2015 12:33:41 +0000
Subject: [PATCH] Fix path canonization while computing the progressive number of the backup file.
---
opendj-server-legacy/src/main/java/org/opends/server/util/BackupManager.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/BackupManager.java b/opendj-server-legacy/src/main/java/org/opends/server/util/BackupManager.java
index 9949a45..4bddca8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/BackupManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/BackupManager.java
@@ -1617,16 +1617,16 @@
*/
private static int getHighestSuffixNumberForPath(final String basePath) throws IOException
{
- final File baseFile = new File(basePath);
+ final File baseFile = new File(basePath).getCanonicalFile();
final File[] existingFiles = baseFile.getParentFile().listFiles();
- final Pattern pattern = Pattern.compile(basePath + "\\d*");
+ final Pattern pattern = Pattern.compile(baseFile + "\\d*");
int highestNumber = 0;
for (File file : existingFiles)
{
final String name = file.getCanonicalPath();
if (pattern.matcher(name).matches())
{
- String numberAsString = name.substring(basePath.length());
+ String numberAsString = name.substring(baseFile.getPath().length());
int number = numberAsString.isEmpty() ? 0 : Integer.valueOf(numberAsString);
highestNumber = number > highestNumber ? number : highestNumber;
}
--
Gitblit v1.10.0