Author: j16sdiz
Date: 2008-08-22 08:37:18 +0000 (Fri, 22 Aug 2008)
New Revision: 22083
Modified:
trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
trunk/freenet/src/freenet/crypt/SSL.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/NodeClientCore.java
trunk/freenet/src/freenet/node/NodeStats.java
trunk/freenet/src/freenet/node/TestnetHandler.java
trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
trunk/freenet/src/freenet/node/fcp/FCPServer.java
Log:
doh! fix left-over from r21839
Modified: trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2008-08-22 08:36:42 UTC (rev 22082)
+++ trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2008-08-22 08:37:18 UTC (rev 22083)
@@ -87,7 +87,8 @@
return ssl;
}
public void set(Boolean val) throws InvalidConfigValueException
{
- if(val == get()) return;
+ if (get().equals(val))
+ return;
if(!SSL.available()) {
throw new InvalidConfigValueException("Enable
SSL support before use ssl with Fproxy");
}
@@ -107,7 +108,8 @@
}
public void set(Long val) throws InvalidConfigValueException {
- if(val == get()) return;
+ if (get().equals(val))
+ return;
FProxyToadlet.MAX_LENGTH = val;
}
}
@@ -217,7 +219,8 @@
}
}
public void set(Boolean val) throws InvalidConfigValueException
{
- if(val == get()) return;
+ if (get().equals(val))
+ return;
synchronized(SimpleToadletServer.this) {
if(val) {
// Start it
@@ -264,7 +267,8 @@
}
public void set(Boolean val) throws InvalidConfigValueException
{
- if(val == get()) return;
+ if (get().equals(val))
+ return;
ts.enableAdvancedMode(val);
}
}
@@ -282,7 +286,8 @@
}
public void set(Boolean val) throws InvalidConfigValueException
{
- if(val == get()) return;
+ if (get().equals(val))
+ return;
ts.enableFProxyJavascript(val);
}
}
Modified: trunk/freenet/src/freenet/crypt/SSL.java
===================================================================
--- trunk/freenet/src/freenet/crypt/SSL.java 2008-08-22 08:36:42 UTC (rev
22082)
+++ trunk/freenet/src/freenet/crypt/SSL.java 2008-08-22 08:37:18 UTC (rev
22083)
@@ -69,7 +69,7 @@
}
public void set(Boolean newValue) throws
InvalidConfigValueException {
- if(newValue != get()) {
+ if (!get().equals(newValue)) {
enable = newValue;
if(enable)
try {
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2008-08-22 08:36:42 UTC (rev
22082)
+++ trunk/freenet/src/freenet/node/Node.java 2008-08-22 08:37:18 UTC (rev
22083)
@@ -1169,7 +1169,8 @@
return isAllowedToConnectToSeednodes;
}
public void set(Boolean val) throws
InvalidConfigValueException {
- if(val == get()) return;
+ if (get().equals(val))
+ return;
synchronized(Node.this) {
if(opennet != null)
throw new
InvalidConfigValueException("Can't change that setting on the fly when opennet
is already active!");
Modified: trunk/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeClientCore.java 2008-08-22 08:36:42 UTC
(rev 22082)
+++ trunk/freenet/src/freenet/node/NodeClientCore.java 2008-08-22 08:37:18 UTC
(rev 22083)
@@ -1,6 +1,5 @@
package freenet.node;
-import freenet.config.NodeNeedRestartException;
import java.io.File;
import java.io.IOException;
import java.net.URI;
@@ -22,6 +21,7 @@
import freenet.clients.http.filter.GenericReadFilterCallback;
import freenet.config.Config;
import freenet.config.InvalidConfigValueException;
+import freenet.config.NodeNeedRestartException;
import freenet.config.SubConfig;
import freenet.crypt.RandomSource;
import freenet.io.xfer.AbortedException;
@@ -180,7 +180,8 @@
}
public void set(Boolean val) throws
InvalidConfigValueException {
- if((val == get()) ||
(persistentTempBucketFactory == null)) return;
+ if (get().equals(val) ||
(persistentTempBucketFactory == null))
+ return;
persistentTempBucketFactory.setEncryption(val);
}
});
@@ -216,7 +217,8 @@
}
public void set(Long val) throws
InvalidConfigValueException {
- if((val == get()) || (tempBucketFactory ==
null)) return;
+ if (get().equals(val) || (tempBucketFactory ==
null))
+ return;
tempBucketFactory.setMaxRAMBucketSize(val);
}
});
@@ -227,7 +229,8 @@
}
public void set(Long val) throws
InvalidConfigValueException {
- if((val == get()) || (tempBucketFactory ==
null)) return;
+ if (get().equals(val) || (tempBucketFactory ==
null))
+ return;
tempBucketFactory.setMaxRamUsed(val);
}
});
@@ -239,7 +242,8 @@
}
public void set(Boolean val) throws
InvalidConfigValueException {
- if((val == get()) || (tempBucketFactory ==
null)) return;
+ if (get().equals(val) || (tempBucketFactory ==
null))
+ return;
tempBucketFactory.setEncryption(val);
}
});
@@ -324,7 +328,8 @@
@Override
public void set(Long val) throws
InvalidConfigValueException, NodeNeedRestartException {
- if(val == get()) return;
+ if (get().equals(val))
+ return;
archiveManager.setMaxArchiveSize(val);
}
});
Modified: trunk/freenet/src/freenet/node/NodeStats.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeStats.java 2008-08-22 08:36:42 UTC
(rev 22082)
+++ trunk/freenet/src/freenet/node/NodeStats.java 2008-08-22 08:37:18 UTC
(rev 22083)
@@ -216,7 +216,8 @@
return threadLimit;
}
public void set(Integer val) throws
InvalidConfigValueException {
- if(val == get()) return;
+ if (get().equals(val))
+ return;
if(val < 100)
throw new
InvalidConfigValueException(l10n("valueTooLow"));
threadLimit = val;
@@ -231,7 +232,8 @@
return aggressiveGCModificator;
}
public void set(Integer val) throws
InvalidConfigValueException {
- if(val == get()) return;
+ if (get().equals(val))
+ return;
Logger.normal(this, "Changing
aggressiveGCModificator to "+val);
aggressiveGCModificator = val;
}
@@ -246,7 +248,8 @@
}
public void set(Boolean val) throws
InvalidConfigValueException {
- if(val == get()) return;
+ if (get().equals(val))
+ return;
if(val)
myMemoryChecker.start();
Modified: trunk/freenet/src/freenet/node/TestnetHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/TestnetHandler.java 2008-08-22 08:36:42 UTC
(rev 22082)
+++ trunk/freenet/src/freenet/node/TestnetHandler.java 2008-08-22 08:37:18 UTC
(rev 22083)
@@ -243,7 +243,8 @@
}
public void set(Integer val) throws InvalidConfigValueException
{
- if(val == get()) return;
+ if (get().equals(val))
+ return;
node.testnetHandler.rebind(val);
}
}
Modified: trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
2008-08-22 08:36:42 UTC (rev 22082)
+++ trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
2008-08-22 08:37:18 UTC (rev 22083)
@@ -116,7 +116,8 @@
}
public void set(Boolean val) throws InvalidConfigValueException {
- if(val == get()) return;
+ if (get().equals(val))
+ return;
// FIXME implement - see bug #122
throw new InvalidConfigValueException("Cannot be updated on the
fly");
}
@@ -132,7 +133,8 @@
}
public void set(Boolean val) throws InvalidConfigValueException {
- if(val == get()) return;
+ if (get().equals(val))
+ return;
if(!SSL.available()) {
throw new InvalidConfigValueException("Enable
SSL support before use ssl with TMCI");
}
@@ -157,7 +159,8 @@
}
public void set(Boolean val) throws InvalidConfigValueException {
- if(val == get()) return;
+ if (get().equals(val))
+ return;
// FIXME implement - see bug #122
throw new InvalidConfigValueException("Cannot be updated on the
fly");
}
@@ -236,7 +239,8 @@
// TODO: implement it
public void set(Integer val) throws InvalidConfigValueException {
- if(val == get()) return;
+ if (get().equals(val))
+ return;
core.getTextModeClientInterface().setPort(val);
}
}
Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java 2008-08-22 08:36:42 UTC
(rev 22082)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java 2008-08-22 08:37:18 UTC
(rev 22083)
@@ -206,7 +206,7 @@
}
public void set(Integer val) throws InvalidConfigValueException
{
- if(val != get()) {
+ if (!get().equals(val)) {
throw new InvalidConfigValueException("Cannot
change FCP port number on the fly");
}
}
@@ -229,7 +229,7 @@
}
//TODO: Allow it
public void set(Boolean val) throws InvalidConfigValueException
{
- if(val != get()) {
+ if (!get().equals(val)) {
throw new
InvalidConfigValueException(l10n("cannotStartOrStopOnTheFly"));
}
}
@@ -246,7 +246,8 @@
}
public void set(Boolean val) throws InvalidConfigValueException
{
- if(val == get()) return;
+ if (get().equals(val))
+ return;
if(!SSL.available()) {
throw new InvalidConfigValueException("Enable
SSL support before use ssl with FCP");
}
@@ -387,7 +388,8 @@
}
public void set(Boolean val) throws InvalidConfigValueException
{
- if(val == get()) return;
+ if (get().equals(val))
+ return;
server.assumeDownloadDDAIsAllowed = val;
}
}
@@ -400,7 +402,8 @@
}
public void set(Boolean val) throws InvalidConfigValueException
{
- if(val == get()) return;
+ if (get().equals(val))
+ return;
server.assumeUploadDDAIsAllowed = val;
}
}
