From 66962c445640f43cf0b1a0bfef5afc9f05e511ac Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 28 Apr 2009 15:14:27 +0000
Subject: [PATCH] Fix for issue 3943 (Inconsistent installation path across tools) Try to use File.getCanonicalPath to display the paths. If this does not work use File.getAbsolutePath() as fall back.
---
opends/src/server/org/opends/server/tasks/ImportTask.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/tasks/ImportTask.java b/opends/src/server/org/opends/server/tasks/ImportTask.java
index f2e6d83..ffe7490 100644
--- a/opends/src/server/org/opends/server/tasks/ImportTask.java
+++ b/opends/src/server/org/opends/server/tasks/ImportTask.java
@@ -290,8 +290,16 @@
File f = new File (s);
if (!f.isAbsolute())
{
- ldifFiles.add(new File(DirectoryServer.getInstanceRoot(), s)
- .getAbsolutePath());
+ f = new File(DirectoryServer.getInstanceRoot(), s);
+ try
+ {
+ s = f.getCanonicalPath();
+ }
+ catch (Exception ex)
+ {
+ s = f.getAbsolutePath();
+ }
+ ldifFiles.add(s);
}
else
{
--
Gitblit v1.10.0