summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/satellitedaemon/Globals.java
diff options
context:
space:
mode:
authorBjörn Hagemeister2014-09-23 16:28:07 +0200
committerBjörn Hagemeister2014-09-23 16:28:07 +0200
commit927d1d5b61a339f9074beb30a080f569d4d0258e (patch)
treeb70523ad0941b877b254640ff1d18110c1dfb0df /src/main/java/org/openslx/satellitedaemon/Globals.java
parentAdapted files to new filetransfer. (diff)
downloadsatellite-daemon-927d1d5b61a339f9074beb30a080f569d4d0258e.tar.gz
satellite-daemon-927d1d5b61a339f9074beb30a080f569d4d0258e.tar.xz
satellite-daemon-927d1d5b61a339f9074beb30a080f569d4d0258e.zip
Removed some out-commented code and merged getUploadInfos(ImageData, filename) and getUploadInfos(ImageData) into one method.
Diffstat (limited to 'src/main/java/org/openslx/satellitedaemon/Globals.java')
-rw-r--r--src/main/java/org/openslx/satellitedaemon/Globals.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/openslx/satellitedaemon/Globals.java b/src/main/java/org/openslx/satellitedaemon/Globals.java
index 72cd423..2cf594c 100644
--- a/src/main/java/org/openslx/satellitedaemon/Globals.java
+++ b/src/main/java/org/openslx/satellitedaemon/Globals.java
@@ -84,7 +84,7 @@ public class Globals {
try {
// Load all entries of the config file into properties
BufferedInputStream stream = new BufferedInputStream(
- new FileInputStream("config/global.properties"));
+ new FileInputStream("config/global.properties.example"));
properties.load(stream);
stream.close();
} catch (IOException e) {