Author: robert
Date: 2008-01-04 23:57:59 +0000 (Fri, 04 Jan 2008)
New Revision: 16899
Modified:
trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
Log:
don't worry about the network port if disabled
Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2008-01-04
23:34:20 UTC (rev 16898)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2008-01-04
23:57:59 UTC (rev 16899)
@@ -667,7 +667,7 @@
server.register(firstTimeWizardToadlet,
FirstTimeWizardToadlet.TOADLET_URL, true, false);
}catch (BindException e){
- Logger.error(core,"Failed to start FProxy port already
bound: isn't Freenet already running ?");
+ Logger.error(core,"Failed to start FProxy port already
bound: isn't Freenet already running ?", e);
System.err.println("Failed to start FProxy port already
bound: isn't Freenet already running ?");
throw new
InvalidConfigValueException(l10n("cantBindPort"));
}catch (IOException ioe) {
Modified: trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2008-01-04 23:34:20 UTC (rev 16898)
+++ trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2008-01-04 23:57:59 UTC (rev 16899)
@@ -364,16 +364,15 @@
ssl = fproxyConfig.getBoolean("ssl");
}
- if(ssl) {
- this.networkInterface =
SSLNetworkInterface.create(port, this.bindTo,
fproxyConfig.getString("allowedHosts"), core.getExecutor(), true);
- } else {
- this.networkInterface = NetworkInterface.create(port,
this.bindTo, fproxyConfig.getString("allowedHosts"), core.getExecutor(), true);
- }
-
if(!enabled) {
Logger.normal(core, "Not starting FProxy as it's
disabled");
System.out.println("Not starting FProxy as it's
disabled");
} else {
+ if(ssl) {
+ this.networkInterface =
SSLNetworkInterface.create(port, this.bindTo,
fproxyConfig.getString("allowedHosts"), core.getExecutor(), true);
+ } else {
+ this.networkInterface =
NetworkInterface.create(port, this.bindTo,
fproxyConfig.getString("allowedHosts"), core.getExecutor(), true);
+ }
myThread = new Thread(this, "SimpleToadletServer");
myThread.setDaemon(true);
}
