mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 07:07:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

comply to coding conventions

Browse source
This commit is contained in:
Florian Reimair 2018-11-07 19:44:17 +01:00
parent 03683a7ecd
commit 3d53c2584a
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java
View file

@ -253,12 +253,12 @@ public class TorNetworkNode extends NetworkNode {
Torrc override = null;
// check if the user wants to provide his own torrc file
String torrcfile = System.getProperty(CONFIG_TORRCFILE);
if(null != torrcfile) {
String torrcFile = System.getProperty(CONFIG_TORRCFILE);
if(null != torrcFile) {
try {
override = new Torrc(new FileInputStream(new File(torrcfile)));
override = new Torrc(new FileInputStream(new File(torrcFile)));
} catch(IOException e) {
log.error("custom torrc file not found (" + torrcfile + "). Proceeding with defaults.");
log.error("custom torrc file not found (" + torrcFile + "). Proceeding with defaults.");
}
}
@ -269,7 +269,7 @@ public class TorNetworkNode extends NetworkNode {
tmp.put(((String) k).substring(CONFIG_TORRCPREFIX.length()), (String) v);
});
if(!tmp.isEmpty())
// check for custom torrcfile
// check for custom torrcFile
if(null != override)
// and merge the contents
override = new Torrc(override.getInputStream$tor(), tmp);