From 8e56a3541e4d0780a59cec88c6e8770565224180 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 18 Nov 2008 01:01:17 +0000
Subject: [PATCH] Fix for issue 3612 (Control Panel: in the "Java Settings" panel, the value for "Java Home" variable is not correct (missing "\" characters)
---
opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
index a498604..a40ccd7 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
@@ -35,7 +35,6 @@
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
@@ -417,29 +416,30 @@
public Void processBackgroundTask() throws Throwable
{
String propertiesFile = getPropertiesFile();
- FileInputStream fs = null;
Properties properties = new Properties();
+ BufferedReader reader = null;
try
{
- fs = new FileInputStream(propertiesFile);
- properties.load(fs);
+ reader = new BufferedReader(new FileReader(propertiesFile));
+ JavaPropertiesTool.updateProperties(reader, properties);
}
catch (Throwable t)
{
}
finally
{
- if (fs != null)
+ if (reader != null)
{
try
{
- fs.close();
+ reader.close();
}
catch (Throwable t)
{
}
}
}
+
String[] scripts =
{
"start-ds", "import-ldif.offline", "backup.online", "base64",
--
Gitblit v1.10.0