diff options
| author | Björn Hagemeister | 2014-09-23 16:28:07 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-09-23 16:28:07 +0200 |
| commit | 927d1d5b61a339f9074beb30a080f569d4d0258e (patch) | |
| tree | b70523ad0941b877b254640ff1d18110c1dfb0df /src/main/java/org/openslx/satellitedaemon/db/MySQL.java | |
| parent | Adapted files to new filetransfer. (diff) | |
| download | satellite-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/db/MySQL.java')
| -rw-r--r-- | src/main/java/org/openslx/satellitedaemon/db/MySQL.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/org/openslx/satellitedaemon/db/MySQL.java b/src/main/java/org/openslx/satellitedaemon/db/MySQL.java index 599cdb1..b4adaf6 100644 --- a/src/main/java/org/openslx/satellitedaemon/db/MySQL.java +++ b/src/main/java/org/openslx/satellitedaemon/db/MySQL.java @@ -35,7 +35,8 @@ class MySQL // Load connection info from class (TODO: Make pretty) Properties properties = new Properties(); try { - final BufferedInputStream stream = new BufferedInputStream( new FileInputStream( "config/mysql.properties" ) ); + // using "mysql.properties.example" for testing + final BufferedInputStream stream = new BufferedInputStream( new FileInputStream( "config/mysql.properties.example" ) ); properties.load( stream ); stream.close(); } catch ( FileNotFoundException e ) { |