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/extensions/FileBasedTrustManagerProvider.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java b/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
index 8b9831a..e5477f9 100644
--- a/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
+++ b/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
@@ -158,7 +158,7 @@
throw new ConfigException(msgID, message);
}
- File f = new File(trustStoreFile);
+ File f = getFileForPath(trustStoreFile);
if (! (f.exists() && f.isFile()))
{
msgID = MSGID_FILE_TRUSTMANAGER_NO_SUCH_FILE;
@@ -358,7 +358,7 @@
{
String fileName = pinFileAttr.activeValue();
- File pinFile = new File(fileName);
+ File pinFile = getFileForPath(fileName);
if (! pinFile.exists())
{
msgID = MSGID_FILE_TRUSTMANAGER_PIN_NO_SUCH_FILE;
@@ -483,7 +483,8 @@
{
trustStore = KeyStore.getInstance(trustStoreType);
- FileInputStream inputStream = new FileInputStream(trustStoreFile);
+ FileInputStream inputStream =
+ new FileInputStream(getFileForPath(trustStoreFile));
trustStore.load(inputStream, trustStorePIN);
inputStream.close();
}
@@ -651,7 +652,7 @@
throw new ConfigException(msgID, message);
}
- File f = new File(newTrustStoreFile);
+ File f = getFileForPath(newTrustStoreFile);
if (! (f.exists() && f.isFile()))
{
msgID = MSGID_FILE_TRUSTMANAGER_NO_SUCH_FILE;
@@ -818,7 +819,7 @@
{
String fileName = pinFileAttr.activeValue();
- File pinFile = new File(fileName);
+ File pinFile = getFileForPath(fileName);
if (! pinFile.exists())
{
msgID = MSGID_FILE_TRUSTMANAGER_PIN_NO_SUCH_FILE;
@@ -952,7 +953,7 @@
throw new ConfigException(msgID, message);
}
- File f = new File(newTrustStoreFile);
+ File f = getFileForPath(newTrustStoreFile);
if (! (f.exists() && f.isFile()))
{
msgID = MSGID_FILE_TRUSTMANAGER_NO_SUCH_FILE;
@@ -1162,7 +1163,7 @@
{
String fileName = pinFileAttr.activeValue();
- File pinFile = new File(fileName);
+ File pinFile = getFileForPath(fileName);
if (! pinFile.exists())
{
msgID = MSGID_FILE_TRUSTMANAGER_PIN_NO_SUCH_FILE;
--
Gitblit v1.10.0