From 1708868c804bd97db1adc5183fe0f6e5da681e97 Mon Sep 17 00:00:00 2001
From: Björn Hagemeister
Date: Mon, 29 Sep 2014 16:41:30 +0200
Subject: Adapted to changes in filetransfer class.

---
 src/main/java/org/openslx/satellitedaemon/Globals.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/main/java/org/openslx/satellitedaemon/Globals.java')

diff --git a/src/main/java/org/openslx/satellitedaemon/Globals.java b/src/main/java/org/openslx/satellitedaemon/Globals.java
index 2cf594c..00d1e0a 100644
--- a/src/main/java/org/openslx/satellitedaemon/Globals.java
+++ b/src/main/java/org/openslx/satellitedaemon/Globals.java
@@ -1,9 +1,11 @@
 package org.openslx.satellitedaemon;
 
-import java.io.BufferedInputStream;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.security.KeyManagementException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -83,8 +85,8 @@ public class Globals {
 	static {
 		try {
 			// Load all entries of the config file into properties
-			BufferedInputStream stream = new BufferedInputStream(
-					new FileInputStream("config/global.properties.example"));
+			InputStreamReader stream = new InputStreamReader(
+					new FileInputStream("config/global.properties"), StandardCharsets.UTF_8);
 			properties.load(stream);
 			stream.close();
 		} catch (IOException e) {
@@ -127,7 +129,7 @@ public class Globals {
 			log.error("Could not find the keystore for the filetransfer. Path was '" + getFiletransferKeystorePath() + "'");
 			return false;
 		} catch (IOException e) {
-			log.error("IOException");
+			log.error("IOException", e);
 			return false;
 		} catch (KeyManagementException e) {
 			log.error("KeyManagementException");
-- 
cgit v1.2.3-55-g7522