From 2518a13dca43c0227a982e429ed83fda8d6110c4 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Wed, 16 Aug 2006 19:45:25 +0000
Subject: [PATCH] Add a getFileForPath method to the StaticUtils class, and update several server components to use it. This can help ensure that relative paths are evaluated relative to the server root rather than whatever happened to be the current working directory when the start script was launched.
---
opends/src/server/org/opends/server/backends/task/TaskBackend.java | 18 +++---------------
1 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/task/TaskBackend.java b/opends/src/server/org/opends/server/backends/task/TaskBackend.java
index c87ce00..6596c97 100644
--- a/opends/src/server/org/opends/server/backends/task/TaskBackend.java
+++ b/opends/src/server/org/opends/server/backends/task/TaskBackend.java
@@ -1342,11 +1342,7 @@
String tmpBackingFile = backingAttr.pendingValue();
if (! taskBackingFile.equals(tmpBackingFile))
{
- File f = new File(tmpBackingFile);
- if (!f.isAbsolute())
- {
- f = new File(DirectoryServer.getServerRoot(), tmpBackingFile);
- }
+ File f = getFileForPath(tmpBackingFile);
if (f.exists())
{
int msgID = MSGID_TASKBE_BACKING_FILE_EXISTS;
@@ -1475,11 +1471,7 @@
tmpBackingFile = backingAttr.pendingValue();
if (! taskBackingFile.equals(tmpBackingFile))
{
- File f = new File(tmpBackingFile);
- if (!f.isAbsolute())
- {
- f = new File(DirectoryServer.getServerRoot(), tmpBackingFile);
- }
+ File f = getFileForPath(tmpBackingFile);
if (f.exists())
{
int msgID = MSGID_TASKBE_BACKING_FILE_EXISTS;
@@ -1617,11 +1609,7 @@
{
assert debugEnter(CLASS_NAME, "getTaskBackingFile");
- File f = new File(taskBackingFile);
- if (!f.isAbsolute())
- {
- f = new File(DirectoryServer.getServerRoot(), taskBackingFile);
- }
+ File f = getFileForPath(taskBackingFile);
return f.getPath();
}
--
Gitblit v1.10.0