From 8619fd2c05e822c433dd3d8c6f3decbffd4b94e4 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 28 Nov 2011 21:52:49 +0000
Subject: [PATCH] dont use equalsIgnoreCase() for booleans
---
.../java/src/net/i2p/i2ptunnel/I2PTunnel.java | 10 +++++-----
.../src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java | 2 +-
.../java/src/net/i2p/i2ptunnel/I2PTunnelServer.java | 2 +-
.../java/src/net/i2p/i2ptunnel/TunnelController.java | 2 +-
.../java/src/net/i2p/i2ptunnel/web/EditBean.java | 2 +-
.../java/src/net/i2p/i2ptunnel/web/IndexBean.java | 4 ++--
.../java/src/net/i2p/router/web/ConfigNetHandler.java | 2 +-
.../java/src/net/i2p/router/web/ConfigNetHelper.java | 8 ++++----
.../java/src/freenet/support/CPUInformation/CPUID.java | 2 +-
core/java/src/net/i2p/util/NativeBigInteger.java | 2 +-
router/java/src/net/i2p/router/Router.java | 2 +-
router/java/src/net/i2p/router/TunnelPoolSettings.java | 2 +-
.../net/i2p/router/transport/CommSystemFacadeImpl.java | 4 ++--
.../src/net/i2p/router/transport/udp/UDPTransport.java | 6 +++---
14 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
index d31b8c3d11..6814cd27b4 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
@@ -738,7 +738,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
String proxy = "";
boolean isShared = true;
if (args.length > 1) {
- if ("true".equalsIgnoreCase(args[1].trim())) {
+ if (Boolean.valueOf(args[1].trim()).booleanValue()) {
isShared = true;
if (args.length == 3)
proxy = args[2];
@@ -807,7 +807,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
String proxy = "";
boolean isShared = true;
if (args.length > 1) {
- if ("true".equalsIgnoreCase(args[1].trim())) {
+ if (Boolean.valueOf(args[1].trim()).booleanValue()) {
isShared = true;
if (args.length == 3)
proxy = args[2];
@@ -878,7 +878,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
boolean isShared = true;
if (args.length > 2) {
- if ("true".equalsIgnoreCase(args[2].trim())) {
+ if (Boolean.valueOf(args[2].trim()).booleanValue()) {
isShared = true;
} else if ("false".equalsIgnoreCase(args[2].trim())) {
_log.warn("args[2] == [" + args[2] + "] and rejected explicitly");
@@ -945,7 +945,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
boolean isShared = false;
if (args.length > 1)
- isShared = "true".equalsIgnoreCase(args[1].trim());
+ isShared = Boolean.valueOf(args[1].trim()).booleanValue();
ownDest = !isShared;
try {
@@ -989,7 +989,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
boolean isShared = false;
if (args.length == 2)
- isShared = "true".equalsIgnoreCase(args[1].trim());
+ isShared = Boolean.valueOf(args[1].trim()).booleanValue();
ownDest = !isShared;
String privateKeyFile = null;
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
index d30aa3e4bb..33563f175b 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
@@ -101,7 +101,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
// Ref: RFC 2617
// If the socket is an InternalSocket, no auth required.
String authRequired = getTunnel().getClientOptions().getProperty(PROP_AUTH);
- if (authRequired != null && (authRequired.equalsIgnoreCase("true") || authRequired.equalsIgnoreCase("basic"))) {
+ if (Boolean.valueOf(authRequired).booleanValue() || "basic".equalsIgnoreCase(authRequired)) {
if (s instanceof InternalSocket) {
if (_log.shouldLog(Log.INFO))
_log.info(getPrefix(requestId) + "Internal access, no auth required");
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
index 94edfac46a..7c231add18 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
@@ -177,7 +177,7 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
if (_usePool) {
String usePool = getTunnel().getClientOptions().getProperty(PROP_USE_POOL);
if (usePool != null)
- _usePool = "true".equalsIgnoreCase(usePool);
+ _usePool = Boolean.valueOf(usePool).booleanValue();
else
_usePool = DEFAULT_USE_POOL;
}
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
index 7653efb508..14771b339f 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
@@ -482,7 +482,7 @@ public class TunnelController implements Logging {
/** default true */
public String getSharedClient() { return _config.getProperty("sharedClient", "true"); }
/** default true */
- public boolean getStartOnLoad() { return "true".equalsIgnoreCase(_config.getProperty("startOnLoad", "true")); }
+ public boolean getStartOnLoad() { return Boolean.valueOf(_config.getProperty("startOnLoad", "true")).booleanValue(); }
public boolean getPersistentClientKey() { return Boolean.valueOf(_config.getProperty("option.persistentClientKey")).booleanValue(); }
public String getMyDestination() {
if (_tunnel != null) {
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
index 100e87bb64..935abdd2fe 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
@@ -114,7 +114,7 @@ public class EditBean extends IndexBean {
public boolean isSharedClient(int tunnel) {
TunnelController tun = getController(tunnel);
if (tun != null)
- return "true".equalsIgnoreCase(tun.getSharedClient());
+ return Boolean.valueOf(tun.getSharedClient()).booleanValue();
else
return false;
}
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
index 3364b0a34a..3b658b65e9 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
@@ -266,7 +266,7 @@ public class IndexBean {
}
// Only modify other shared tunnels
// if the current tunnel is shared, and of supported type
- if ("true".equalsIgnoreCase(cur.getSharedClient()) && isClient(cur.getType())) {
+ if (Boolean.valueOf(cur.getSharedClient()).booleanValue() && isClient(cur.getType())) {
// all clients use the same I2CP session, and as such, use the same I2CP options
List controllers = _group.getControllers();
@@ -278,7 +278,7 @@ public class IndexBean {
// Only modify this non-current tunnel
// if it belongs to a shared destination, and is of supported type
- if ("true".equalsIgnoreCase(c.getSharedClient()) && isClient(c.getType())) {
+ if (Boolean.valueOf(c.getSharedClient()).booleanValue() && isClient(c.getType())) {
Properties cOpt = c.getConfig("");
if (_tunnelQuantity != null) {
cOpt.setProperty("option.inbound.quantity", _tunnelQuantity);
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java
index 905b12b6f2..9427a3e8a5 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java
@@ -169,7 +169,7 @@ public class ConfigNetHandler extends FormHandler {
String oldNPort = _context.getProperty(ConfigNetHelper.PROP_I2NP_NTCP_PORT, "");
String oldAutoHost = _context.getProperty(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_IP, "true");
String sAutoPort = _context.getProperty(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_PORT, "true");
- boolean oldAutoPort = "true".equalsIgnoreCase(sAutoPort);
+ boolean oldAutoPort = Boolean.valueOf(sAutoPort).booleanValue();
if (_ntcpHostname == null) _ntcpHostname = "";
if (_ntcpPort == null) _ntcpPort = "";
if (_ntcpAutoIP == null) _ntcpAutoIP = "true";
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
index d8ea992b0d..9e44b7a2d3 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
@@ -68,8 +68,8 @@ public class ConfigNetHelper extends HelperBase {
}
public String getEnableTimeSyncChecked() {
- String disabled = _context.getProperty(Timestamper.PROP_DISABLED, "false");
- if ( (disabled != null) && ("true".equalsIgnoreCase(disabled)) )
+ boolean disabled = _context.getBooleanProperty(Timestamper.PROP_DISABLED);
+ if (disabled)
return "";
else
return CHECKED;
@@ -77,7 +77,7 @@ public class ConfigNetHelper extends HelperBase {
/** @param prop must default to false */
public String getChecked(String prop) {
- if (Boolean.valueOf(_context.getProperty(prop)).booleanValue())
+ if (_context.getBooleanProperty(prop))
return CHECKED;
return "";
}
@@ -130,7 +130,7 @@ public class ConfigNetHelper extends HelperBase {
/** default true */
public String getUpnpChecked() {
- if (Boolean.valueOf(_context.getProperty(TransportManager.PROP_ENABLE_UPNP, "true")).booleanValue())
+ if (_context.getBooleanPropertyDefaultTrue(TransportManager.PROP_ENABLE_UPNP))
return CHECKED;
return "";
}
diff --git a/core/java/src/freenet/support/CPUInformation/CPUID.java b/core/java/src/freenet/support/CPUInformation/CPUID.java
index 197937496b..e063e4ec96 100644
--- a/core/java/src/freenet/support/CPUInformation/CPUID.java
+++ b/core/java/src/freenet/support/CPUInformation/CPUID.java
@@ -260,7 +260,7 @@ public class CPUID {
private static final void loadNative() {
try{
String wantedProp = System.getProperty("jcpuid.enable", "true");
- boolean wantNative = "true".equalsIgnoreCase(wantedProp);
+ boolean wantNative = Boolean.valueOf(wantedProp).booleanValue();
if (wantNative) {
boolean loaded = loadGeneric();
if (loaded) {
diff --git a/core/java/src/net/i2p/util/NativeBigInteger.java b/core/java/src/net/i2p/util/NativeBigInteger.java
index 74dd5b1d01..42dd9edf5b 100644
--- a/core/java/src/net/i2p/util/NativeBigInteger.java
+++ b/core/java/src/net/i2p/util/NativeBigInteger.java
@@ -460,7 +460,7 @@ public class NativeBigInteger extends BigInteger {
private static final void loadNative() {
try{
String wantedProp = System.getProperty("jbigi.enable", "true");
- boolean wantNative = "true".equalsIgnoreCase(wantedProp);
+ boolean wantNative = Boolean.valueOf(wantedProp).booleanValue();
if (wantNative) {
debug("trying loadGeneric");
boolean loaded = loadGeneric("jbigi");
diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java
index 66de4c743e..77994bdb3a 100644
--- a/router/java/src/net/i2p/router/Router.java
+++ b/router/java/src/net/i2p/router/Router.java
@@ -1116,7 +1116,7 @@ public class Router implements RouterClock.ClockShiftListener {
_log.log(Log.CRIT, "Shutdown(" + exitCode + ") complete" /* , new Exception("Shutdown") */ );
try { _context.logManager().shutdown(); } catch (Throwable t) { }
if (ALLOW_DYNAMIC_KEYS) {
- if (Boolean.valueOf(_context.getProperty(PROP_DYNAMIC_KEYS)).booleanValue())
+ if (_context.getBooleanProperty(PROP_DYNAMIC_KEYS))
killKeys();
}
diff --git a/router/java/src/net/i2p/router/TunnelPoolSettings.java b/router/java/src/net/i2p/router/TunnelPoolSettings.java
index f4a9618aaa..533eceaeb1 100644
--- a/router/java/src/net/i2p/router/TunnelPoolSettings.java
+++ b/router/java/src/net/i2p/router/TunnelPoolSettings.java
@@ -236,7 +236,7 @@ public class TunnelPoolSettings {
private static final boolean getBoolean(String str, boolean defaultValue) {
if (str == null) return defaultValue;
- boolean v = "TRUE".equalsIgnoreCase(str) || "YES".equalsIgnoreCase(str);
+ boolean v = Boolean.valueOf(str).booleanValue() || "YES".equalsIgnoreCase(str);
return v;
}
diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
index ce51a6134c..634a8c8f5f 100644
--- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
+++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
@@ -329,7 +329,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
if (_log.shouldLog(Log.INFO))
_log.info("old: " + ohost + " config: " + name + " auto: " + enabled + " status: " + status);
if (enabled.equalsIgnoreCase("always") ||
- (enabled.equalsIgnoreCase("true") && status == STATUS_OK)) {
+ (Boolean.valueOf(enabled).booleanValue() && status == STATUS_OK)) {
String nhost = UDPProps.getProperty(UDPAddress.PROP_HOST);
if (_log.shouldLog(Log.INFO))
_log.info("old: " + ohost + " config: " + name + " new: " + nhost);
@@ -352,7 +352,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
changed = true;
} else if (ohost == null || ohost.length() <= 0) {
return;
- } else if (enabled.equalsIgnoreCase("true") && status != STATUS_OK) {
+ } else if (Boolean.valueOf(enabled).booleanValue() && status != STATUS_OK) {
// UDP transitioned to not-OK, turn off NTCP address
// This will commonly happen at startup if we were initially OK
// because UPnP was successful, but a subsequent SSU Peer Test determines
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
index 2f0eabad05..819487cf0a 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
@@ -584,7 +584,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
// For now, only do this at startup
if (oldIP != null &&
System.getProperty("wrapper.version") != null &&
- Boolean.valueOf(_context.getProperty(PROP_LAPTOP_MODE)).booleanValue() &&
+ _context.getBooleanProperty(PROP_LAPTOP_MODE) &&
now - lastChanged > 10*60*1000 &&
_context.router().getUptime() < 10*60*1000) {
_log.log(Log.CRIT, "IP changed, restarting with a new identity and port");
@@ -613,7 +613,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
if (addr.length < 4) return false;
if (isPubliclyRoutable(addr))
return true;
- return Boolean.valueOf(_context.getProperty("i2np.udp.allowLocal")).booleanValue();
+ return _context.getBooleanProperty("i2np.udp.allowLocal");
}
private boolean getIsPortFixed() {
@@ -1364,7 +1364,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
if ( (old.getPort() != newAddr.getPort()) || (!oldHost.equals(newHost)) ) {
// substantial data has changed, so if we are in 'dynamic keys' mode, restart the
// router hard and regenerate a new identity
- if ("true".equalsIgnoreCase(_context.getProperty(Router.PROP_DYNAMIC_KEYS, "false"))) {
+ if (_context.getBooleanProperty(Router.PROP_DYNAMIC_KEYS)) {
if (_log.shouldLog(Log.ERROR))
_log.error("SSU address updated. new address: "
+ newAddr.getHostAddress() + ":" + newAddr.getPort() + ", old address: "
--
GitLab