summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/network
diff options
context:
space:
mode:
authorSimon Rettberg2015-07-21 12:40:53 +0200
committerSimon Rettberg2015-07-21 12:40:53 +0200
commitd13036a0227139287c682ebf63c73a4d459ccbdf (patch)
treee2baf3b12ed3fd950097e6dd865322d848e34d75 /src/main/java/org/openslx/network
parentThrift API changes, add configurable timeout to file transfer classes (diff)
downloadmaster-sync-shared-d13036a0227139287c682ebf63c73a4d459ccbdf.tar.gz
master-sync-shared-d13036a0227139287c682ebf63c73a4d459ccbdf.tar.xz
master-sync-shared-d13036a0227139287c682ebf63c73a4d459ccbdf.zip
Extended Util class
Diffstat (limited to 'src/main/java/org/openslx/network')
-rw-r--r--src/main/java/org/openslx/network/ProxyProperties.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/network/ProxyProperties.java b/src/main/java/org/openslx/network/ProxyProperties.java
index 71a9b24..5dacc57 100644
--- a/src/main/java/org/openslx/network/ProxyProperties.java
+++ b/src/main/java/org/openslx/network/ProxyProperties.java
@@ -39,7 +39,7 @@ public class ProxyProperties
// Integers //
public static int getProxyPort()
{
- return Util.tryToParseInt( properties.getProperty( "PROXY_PORT", "0" ) );
+ return Util.parseInt( properties.getProperty( "PROXY_PORT", "0" ), 0 );
}
static
@@ -63,7 +63,7 @@ public class ProxyProperties
} catch ( IOException e ) {
log.warn( "Could not load proxy properties from '/opt/openslx/proxy/conf'." );
} finally {
- Util.streamClose( stream );
+ Util.safeClose( stream );
}
}