From 3bc2e469cc21c7b0d02bdbcabbf3cba8f6c1fa8c Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 16 May 2010 18:08:24 +0000 Subject: [PATCH] remove unnecessaary initializers from constructors --- core/java/src/net/i2p/data/Address.java | 2 -- core/java/src/net/i2p/data/ByteArray.java | 4 +--- core/java/src/net/i2p/data/Certificate.java | 2 -- core/java/src/net/i2p/data/Destination.java | 5 ----- core/java/src/net/i2p/data/Hash.java | 1 - core/java/src/net/i2p/data/Lease.java | 5 ----- core/java/src/net/i2p/data/LeaseSet.java | 10 ---------- core/java/src/net/i2p/data/Payload.java | 2 -- core/java/src/net/i2p/data/PrivateKey.java | 3 +-- core/java/src/net/i2p/data/PublicKey.java | 3 +-- core/java/src/net/i2p/data/RouterAddress.java | 3 --- core/java/src/net/i2p/data/RouterIdentity.java | 4 ---- core/java/src/net/i2p/data/RouterInfo.java | 9 --------- core/java/src/net/i2p/data/SessionKey.java | 2 +- core/java/src/net/i2p/data/Signature.java | 3 ++- core/java/src/net/i2p/data/SigningPrivateKey.java | 4 ++-- core/java/src/net/i2p/data/SigningPublicKey.java | 4 ++-- core/java/src/net/i2p/data/i2cp/AbuseReason.java | 1 - .../src/net/i2p/data/i2cp/CreateLeaseSetMessage.java | 4 ---- .../src/net/i2p/data/i2cp/DestroySessionMessage.java | 1 - .../src/net/i2p/data/i2cp/DisconnectMessage.java | 1 - .../src/net/i2p/data/i2cp/MessagePayloadMessage.java | 1 - .../net/i2p/data/i2cp/ReconfigureSessionMessage.java | 2 -- .../src/net/i2p/data/i2cp/ReportAbuseMessage.java | 4 ---- .../net/i2p/data/i2cp/RequestLeaseSetMessage.java | 2 -- .../net/i2p/data/i2cp/SendMessageExpiresMessage.java | 1 - .../src/net/i2p/data/i2cp/SendMessageMessage.java | 4 ---- core/java/src/net/i2p/data/i2cp/SessionConfig.java | 2 -- .../src/net/i2p/data/i2cp/SessionStatusMessage.java | 1 - core/java/src/net/i2p/stat/Frequency.java | 3 --- core/java/src/net/i2p/stat/Rate.java | 12 ------------ router/java/src/net/i2p/data/i2np/DataMessage.java | 1 - .../i2p/data/i2np/DatabaseSearchReplyMessage.java | 2 -- .../src/net/i2p/data/i2np/DatabaseStoreMessage.java | 6 ------ .../src/net/i2p/data/i2np/DeliveryInstructions.java | 7 ------- router/java/src/net/i2p/data/i2np/GarlicClove.java | 4 ---- router/java/src/net/i2p/data/i2np/GarlicMessage.java | 1 - .../src/net/i2p/data/i2np/I2NPMessageHandler.java | 1 - .../java/src/net/i2p/data/i2np/I2NPMessageImpl.java | 2 -- router/java/src/net/i2p/router/JobImpl.java | 2 -- router/java/src/net/i2p/router/JobStats.java | 3 --- router/java/src/net/i2p/router/JobTiming.java | 2 -- router/java/src/net/i2p/router/OutNetMessage.java | 10 ---------- .../java/src/net/i2p/router/TunnelPoolSettings.java | 5 ----- 44 files changed, 10 insertions(+), 141 deletions(-) diff --git a/core/java/src/net/i2p/data/Address.java b/core/java/src/net/i2p/data/Address.java index fb87f988e..777be8661 100644 --- a/core/java/src/net/i2p/data/Address.java +++ b/core/java/src/net/i2p/data/Address.java @@ -9,8 +9,6 @@ public class Address extends DataStructureImpl { private Destination _destination; public Address() { - _hostname = null; - _destination = null; } public String getHostname() { diff --git a/core/java/src/net/i2p/data/ByteArray.java b/core/java/src/net/i2p/data/ByteArray.java index 1ececc305..7369a27d1 100644 --- a/core/java/src/net/i2p/data/ByteArray.java +++ b/core/java/src/net/i2p/data/ByteArray.java @@ -22,11 +22,9 @@ public class ByteArray implements Serializable, Comparable { private int _offset; public ByteArray() { - this(null); } public ByteArray(byte[] data) { - _offset = 0; _data = data; _valid = (data != null ? data.length : 0); } @@ -92,4 +90,4 @@ public class ByteArray implements Serializable, Comparable { public final String toBase64() { return Base64.encode(_data, _offset, _valid); } -} \ No newline at end of file +} diff --git a/core/java/src/net/i2p/data/Certificate.java b/core/java/src/net/i2p/data/Certificate.java index 9518baab4..855d474ca 100644 --- a/core/java/src/net/i2p/data/Certificate.java +++ b/core/java/src/net/i2p/data/Certificate.java @@ -42,8 +42,6 @@ public class Certificate extends DataStructureImpl { public final static int CERTIFICATE_TYPE_MULTIPLE = 4; public Certificate() { - _type = 0; - _payload = null; } public Certificate(int type, byte[] payload) { diff --git a/core/java/src/net/i2p/data/Destination.java b/core/java/src/net/i2p/data/Destination.java index 2e01271e6..4a00d78c9 100644 --- a/core/java/src/net/i2p/data/Destination.java +++ b/core/java/src/net/i2p/data/Destination.java @@ -27,10 +27,6 @@ public class Destination extends DataStructureImpl { protected Hash __calculatedHash; public Destination() { - setCertificate(null); - setSigningPublicKey(null); - setPublicKey(null); - __calculatedHash = null; } /** @@ -38,7 +34,6 @@ public class Destination extends DataStructureImpl { * @param s a Base64 representation of the destination, as (eg) is used in hosts.txt */ public Destination(String s) throws DataFormatException { - this(); fromBase64(s); } diff --git a/core/java/src/net/i2p/data/Hash.java b/core/java/src/net/i2p/data/Hash.java index b18c4677c..83579d116 100644 --- a/core/java/src/net/i2p/data/Hash.java +++ b/core/java/src/net/i2p/data/Hash.java @@ -29,7 +29,6 @@ public class Hash extends DataStructureImpl { public final static Hash FAKE_HASH = new Hash(new byte[HASH_LENGTH]); public Hash() { - setData(null); } public Hash(byte data[]) { diff --git a/core/java/src/net/i2p/data/Lease.java b/core/java/src/net/i2p/data/Lease.java index 850763983..17abdc92b 100644 --- a/core/java/src/net/i2p/data/Lease.java +++ b/core/java/src/net/i2p/data/Lease.java @@ -30,11 +30,6 @@ public class Lease extends DataStructureImpl { private int _numFailure; public Lease() { - setGateway(null); - setTunnelId(null); - setEndDate(null); - setNumSuccess(0); - setNumFailure(0); } /** Retrieve the router at which the destination can be contacted diff --git a/core/java/src/net/i2p/data/LeaseSet.java b/core/java/src/net/i2p/data/LeaseSet.java index 061091c61..81de8e326 100644 --- a/core/java/src/net/i2p/data/LeaseSet.java +++ b/core/java/src/net/i2p/data/LeaseSet.java @@ -78,18 +78,8 @@ public class LeaseSet extends DataStructureImpl { public final static int MAX_LEASES = 6; public LeaseSet() { - setDestination(null); - setEncryptionKey(null); - setSigningKey(null); - setSignature(null); - setRoutingKey(null); _leases = new ArrayList(MAX_LEASES); - _routingKeyGenMod = null; - _receivedAsPublished = false; _firstExpiration = Long.MAX_VALUE; - _lastExpiration = 0; - _decrypted = false; - _checked = false; } public Destination getDestination() { diff --git a/core/java/src/net/i2p/data/Payload.java b/core/java/src/net/i2p/data/Payload.java index a16a64418..89cac8ff5 100644 --- a/core/java/src/net/i2p/data/Payload.java +++ b/core/java/src/net/i2p/data/Payload.java @@ -27,8 +27,6 @@ public class Payload extends DataStructureImpl { private byte[] _unencryptedData; public Payload() { - setUnencryptedData(null); - setEncryptedData(null); } /** diff --git a/core/java/src/net/i2p/data/PrivateKey.java b/core/java/src/net/i2p/data/PrivateKey.java index c4c34b0e8..48f8ad816 100644 --- a/core/java/src/net/i2p/data/PrivateKey.java +++ b/core/java/src/net/i2p/data/PrivateKey.java @@ -28,8 +28,8 @@ public class PrivateKey extends DataStructureImpl { public final static int KEYSIZE_BYTES = 256; public PrivateKey() { - setData(null); } + public PrivateKey(byte data[]) { setData(data); } /** constructs from base64 @@ -37,7 +37,6 @@ public class PrivateKey extends DataStructureImpl { * on a prior instance of PrivateKey */ public PrivateKey(String base64Data) throws DataFormatException { - this(); fromBase64(base64Data); } diff --git a/core/java/src/net/i2p/data/PublicKey.java b/core/java/src/net/i2p/data/PublicKey.java index 3496f8d55..3d822949e 100644 --- a/core/java/src/net/i2p/data/PublicKey.java +++ b/core/java/src/net/i2p/data/PublicKey.java @@ -26,8 +26,8 @@ public class PublicKey extends DataStructureImpl { public final static int KEYSIZE_BYTES = 256; public PublicKey() { - setData(null); } + public PublicKey(byte data[]) { if ( (data == null) || (data.length != KEYSIZE_BYTES) ) throw new IllegalArgumentException("Data must be specified, and the correct size"); @@ -39,7 +39,6 @@ public class PublicKey extends DataStructureImpl { * on a prior instance of PublicKey */ public PublicKey(String base64Data) throws DataFormatException { - this(); fromBase64(base64Data); } diff --git a/core/java/src/net/i2p/data/RouterAddress.java b/core/java/src/net/i2p/data/RouterAddress.java index cc582a358..9d199e574 100644 --- a/core/java/src/net/i2p/data/RouterAddress.java +++ b/core/java/src/net/i2p/data/RouterAddress.java @@ -29,9 +29,6 @@ public class RouterAddress extends DataStructureImpl { public RouterAddress() { setCost(-1); - setExpiration(null); - setTransportStyle(null); - setOptions(null); } /** diff --git a/core/java/src/net/i2p/data/RouterIdentity.java b/core/java/src/net/i2p/data/RouterIdentity.java index 095b54f44..310bd11aa 100644 --- a/core/java/src/net/i2p/data/RouterIdentity.java +++ b/core/java/src/net/i2p/data/RouterIdentity.java @@ -31,10 +31,6 @@ public class RouterIdentity extends DataStructureImpl { private Hash __calculatedHash; public RouterIdentity() { - setCertificate(null); - setSigningPublicKey(null); - setPublicKey(null); - __calculatedHash = null; } public Certificate getCertificate() { diff --git a/core/java/src/net/i2p/data/RouterInfo.java b/core/java/src/net/i2p/data/RouterInfo.java index 9968a324d..2d16af82e 100644 --- a/core/java/src/net/i2p/data/RouterInfo.java +++ b/core/java/src/net/i2p/data/RouterInfo.java @@ -60,18 +60,9 @@ public class RouterInfo extends DataStructureImpl { public static final String BW_CAPABILITY_CHARS = "KLMNO"; public RouterInfo() { - setIdentity(null); - setPublished(0); _addresses = new HashSet(2); _peers = new HashSet(0); _options = new OrderedProperties(); - setSignature(null); - _validated = false; - _isValid = false; - _currentRoutingKey = null; - _stringified = null; - _byteified = null; - _hashCodeInitialized = false; } public RouterInfo(RouterInfo old) { diff --git a/core/java/src/net/i2p/data/SessionKey.java b/core/java/src/net/i2p/data/SessionKey.java index deaf292b5..a506c8387 100644 --- a/core/java/src/net/i2p/data/SessionKey.java +++ b/core/java/src/net/i2p/data/SessionKey.java @@ -27,8 +27,8 @@ public class SessionKey extends DataStructureImpl { public static final SessionKey INVALID_KEY = new SessionKey(new byte[KEYSIZE_BYTES]); public SessionKey() { - this(null); } + public SessionKey(byte data[]) { setData(data); } diff --git a/core/java/src/net/i2p/data/Signature.java b/core/java/src/net/i2p/data/Signature.java index 2c35edebc..8ed31a5b7 100644 --- a/core/java/src/net/i2p/data/Signature.java +++ b/core/java/src/net/i2p/data/Signature.java @@ -30,7 +30,8 @@ public class Signature extends DataStructureImpl { FAKE_SIGNATURE[i] = 0x00; } - public Signature() { this(null); } + public Signature() {} + public Signature(byte data[]) { setData(data); } public byte[] getData() { diff --git a/core/java/src/net/i2p/data/SigningPrivateKey.java b/core/java/src/net/i2p/data/SigningPrivateKey.java index 3c1e71254..40fda013a 100644 --- a/core/java/src/net/i2p/data/SigningPrivateKey.java +++ b/core/java/src/net/i2p/data/SigningPrivateKey.java @@ -28,7 +28,8 @@ public class SigningPrivateKey extends DataStructureImpl { public final static int KEYSIZE_BYTES = 20; - public SigningPrivateKey() { this((byte[])null); } + public SigningPrivateKey() {} + public SigningPrivateKey(byte data[]) { setData(data); } /** constructs from base64 @@ -36,7 +37,6 @@ public class SigningPrivateKey extends DataStructureImpl { * on a prior instance of SigningPrivateKey */ public SigningPrivateKey(String base64Data) throws DataFormatException { - this(); fromBase64(base64Data); } diff --git a/core/java/src/net/i2p/data/SigningPublicKey.java b/core/java/src/net/i2p/data/SigningPublicKey.java index 2d2cf2f9b..4f2b68df8 100644 --- a/core/java/src/net/i2p/data/SigningPublicKey.java +++ b/core/java/src/net/i2p/data/SigningPublicKey.java @@ -26,7 +26,8 @@ public class SigningPublicKey extends DataStructureImpl { public final static int KEYSIZE_BYTES = 128; - public SigningPublicKey() { this((byte[])null); } + public SigningPublicKey() {} + public SigningPublicKey(byte data[]) { setData(data); } /** constructs from base64 @@ -34,7 +35,6 @@ public class SigningPublicKey extends DataStructureImpl { * on a prior instance of SigningPublicKey */ public SigningPublicKey(String base64Data) throws DataFormatException { - this(); fromBase64(base64Data); } diff --git a/core/java/src/net/i2p/data/i2cp/AbuseReason.java b/core/java/src/net/i2p/data/i2cp/AbuseReason.java index 58c23d5e8..f631fa591 100644 --- a/core/java/src/net/i2p/data/i2cp/AbuseReason.java +++ b/core/java/src/net/i2p/data/i2cp/AbuseReason.java @@ -27,7 +27,6 @@ public class AbuseReason extends DataStructureImpl { private String _reason; public AbuseReason() { - setReason(null); } public String getReason() { diff --git a/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java b/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java index cf6759a26..4425a8d00 100644 --- a/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java +++ b/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java @@ -33,10 +33,6 @@ public class CreateLeaseSetMessage extends I2CPMessageImpl { private PrivateKey _privateKey; public CreateLeaseSetMessage() { - setSessionId(null); - setLeaseSet(null); - setSigningPrivateKey(null); - setPrivateKey(null); } public SessionId getSessionId() { diff --git a/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java b/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java index 630e0e718..8b4db852f 100644 --- a/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java +++ b/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java @@ -27,7 +27,6 @@ public class DestroySessionMessage extends I2CPMessageImpl { private SessionId _sessionId; public DestroySessionMessage() { - setSessionId(null); } public SessionId getSessionId() { diff --git a/core/java/src/net/i2p/data/i2cp/DisconnectMessage.java b/core/java/src/net/i2p/data/i2cp/DisconnectMessage.java index f9c32810d..1931fead2 100644 --- a/core/java/src/net/i2p/data/i2cp/DisconnectMessage.java +++ b/core/java/src/net/i2p/data/i2cp/DisconnectMessage.java @@ -27,7 +27,6 @@ public class DisconnectMessage extends I2CPMessageImpl { private String _reason; public DisconnectMessage() { - setReason(null); } public String getReason() { diff --git a/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java b/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java index 6c041f11c..f06fe86f3 100644 --- a/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java +++ b/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java @@ -31,7 +31,6 @@ public class MessagePayloadMessage extends I2CPMessageImpl { public MessagePayloadMessage() { setSessionId(-1); setMessageId(-1); - setPayload(null); } public long getSessionId() { diff --git a/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java b/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java index 5f7314d64..9400091be 100644 --- a/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java @@ -28,8 +28,6 @@ public class ReconfigureSessionMessage extends I2CPMessageImpl { private SessionConfig _sessionConfig; public ReconfigureSessionMessage() { - _sessionId = null; - _sessionConfig = null; } public SessionId getSessionId() { diff --git a/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java b/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java index 54b90292e..137d364c7 100644 --- a/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java @@ -30,10 +30,6 @@ public class ReportAbuseMessage extends I2CPMessageImpl { private MessageId _messageId; public ReportAbuseMessage() { - setSessionId(null); - setSeverity(null); - setReason(null); - setMessageId(null); } public SessionId getSessionId() { diff --git a/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java b/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java index 35249c76c..ef877afe5 100644 --- a/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java +++ b/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java @@ -34,9 +34,7 @@ public class RequestLeaseSetMessage extends I2CPMessageImpl { private Date _end; public RequestLeaseSetMessage() { - setSessionId(null); _endpoints = new ArrayList(); - setEndDate(null); } public SessionId getSessionId() { diff --git a/core/java/src/net/i2p/data/i2cp/SendMessageExpiresMessage.java b/core/java/src/net/i2p/data/i2cp/SendMessageExpiresMessage.java index 770a6777b..9bcabe2fb 100644 --- a/core/java/src/net/i2p/data/i2cp/SendMessageExpiresMessage.java +++ b/core/java/src/net/i2p/data/i2cp/SendMessageExpiresMessage.java @@ -34,7 +34,6 @@ public class SendMessageExpiresMessage extends SendMessageMessage { public SendMessageExpiresMessage() { super(); - setExpiration(null); } public Date getExpiration() { diff --git a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java b/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java index 237306f0d..dc2cef33d 100644 --- a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java +++ b/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java @@ -32,10 +32,6 @@ public class SendMessageMessage extends I2CPMessageImpl { private long _nonce; public SendMessageMessage() { - setSessionId(null); - setDestination(null); - setPayload(null); - setNonce(0); } public SessionId getSessionId() { diff --git a/core/java/src/net/i2p/data/i2cp/SessionConfig.java b/core/java/src/net/i2p/data/i2cp/SessionConfig.java index 520413620..b96918a45 100644 --- a/core/java/src/net/i2p/data/i2cp/SessionConfig.java +++ b/core/java/src/net/i2p/data/i2cp/SessionConfig.java @@ -51,9 +51,7 @@ public class SessionConfig extends DataStructureImpl { } public SessionConfig(Destination dest) { _destination = dest; - _signature = null; _creationDate = new Date(Clock.getInstance().now()); - _options = null; } /** diff --git a/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java b/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java index dab34ed43..b26ec05f0 100644 --- a/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java +++ b/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java @@ -33,7 +33,6 @@ public class SessionStatusMessage extends I2CPMessageImpl { public final static int STATUS_INVALID = 3; public SessionStatusMessage() { - setSessionId(null); setStatus(STATUS_INVALID); } diff --git a/core/java/src/net/i2p/stat/Frequency.java b/core/java/src/net/i2p/stat/Frequency.java index 16e4c8f4a..6be7dc3c9 100644 --- a/core/java/src/net/i2p/stat/Frequency.java +++ b/core/java/src/net/i2p/stat/Frequency.java @@ -15,9 +15,6 @@ public class Frequency { public Frequency(long period) { setPeriod(period); - setLastEvent(0); - setAverageInterval(0); - setMinAverageInterval(0); } /** how long is this frequency averaged over? */ diff --git a/core/java/src/net/i2p/stat/Rate.java b/core/java/src/net/i2p/stat/Rate.java index 764691d6d..25305bce7 100644 --- a/core/java/src/net/i2p/stat/Rate.java +++ b/core/java/src/net/i2p/stat/Rate.java @@ -120,18 +120,6 @@ public class Rate { */ public Rate(long period) throws IllegalArgumentException { if (period <= 0) throw new IllegalArgumentException("The period must be strictly positive"); - _currentTotalValue = 0.0d; - _currentEventCount = 0; - _currentTotalEventTime = 0; - _lastTotalValue = 0.0d; - _lastEventCount = 0; - _lastTotalEventTime = 0; - _extremeTotalValue = 0.0d; - _extremeEventCount = 0; - _extremeTotalEventTime = 0; - _lifetimeTotalValue = 0.0d; - _lifetimeEventCount = 0; - _lifetimeTotalEventTime = 0; _creationDate = now(); _lastCoalesceDate = _creationDate; diff --git a/router/java/src/net/i2p/data/i2np/DataMessage.java b/router/java/src/net/i2p/data/i2np/DataMessage.java index e98630bc8..dcfff1805 100644 --- a/router/java/src/net/i2p/data/i2np/DataMessage.java +++ b/router/java/src/net/i2p/data/i2np/DataMessage.java @@ -24,7 +24,6 @@ public class DataMessage extends I2NPMessageImpl { public DataMessage(I2PAppContext context) { super(context); - _data = null; } public byte[] getData() { diff --git a/router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java b/router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java index 085edc5a0..08f5511df 100644 --- a/router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java +++ b/router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java @@ -34,9 +34,7 @@ public class DatabaseSearchReplyMessage extends I2NPMessageImpl { // do this in netdb if we need it //_context.statManager().createRateStat("netDb.searchReplyMessageSend", "How many search reply messages we send", "NetworkDatabase", new long[] { 60*1000, 5*60*1000, 10*60*1000, 60*60*1000 }); //_context.statManager().createRateStat("netDb.searchReplyMessageReceive", "How many search reply messages we receive", "NetworkDatabase", new long[] { 60*1000, 5*60*1000, 10*60*1000, 60*60*1000 }); - setSearchKey(null); _peerHashes = new ArrayList(3); - setFromHash(null); } /** diff --git a/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java b/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java index 1e90ec716..f85ecce23 100644 --- a/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java +++ b/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java @@ -43,12 +43,6 @@ public class DatabaseStoreMessage extends I2NPMessageImpl { public DatabaseStoreMessage(I2PAppContext context) { super(context); setValueType(-1); - setKey(null); - setLeaseSet(null); - setRouterInfo(null); - setReplyToken(0); - setReplyTunnel(null); - setReplyGateway(null); } /** diff --git a/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java b/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java index 98935a394..6c9ddb154 100644 --- a/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java +++ b/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java @@ -51,14 +51,7 @@ public class DeliveryInstructions extends DataStructureImpl { private final static long FLAG_DELAY = 16; public DeliveryInstructions() { - setEncrypted(false); - setEncryptionKey(null); setDeliveryMode(-1); - setDestination(null); - setRouter(null); - setTunnelId(null); - setDelayRequested(false); - setDelaySeconds(0); } public boolean getEncrypted() { return _encrypted; } diff --git a/router/java/src/net/i2p/data/i2np/GarlicClove.java b/router/java/src/net/i2p/data/i2np/GarlicClove.java index b9bc3d4e7..1380dfd60 100644 --- a/router/java/src/net/i2p/data/i2np/GarlicClove.java +++ b/router/java/src/net/i2p/data/i2np/GarlicClove.java @@ -40,11 +40,7 @@ public class GarlicClove extends DataStructureImpl { _context = context; _log = context.logManager().getLog(GarlicClove.class); _handler = new I2NPMessageHandler(context); - setInstructions(null); - setData(null); setCloveId(-1); - setExpiration(null); - setCertificate(null); } public DeliveryInstructions getInstructions() { return _instructions; } diff --git a/router/java/src/net/i2p/data/i2np/GarlicMessage.java b/router/java/src/net/i2p/data/i2np/GarlicMessage.java index 72d7e5d06..cf92ce758 100644 --- a/router/java/src/net/i2p/data/i2np/GarlicMessage.java +++ b/router/java/src/net/i2p/data/i2np/GarlicMessage.java @@ -26,7 +26,6 @@ public class GarlicMessage extends I2NPMessageImpl { public GarlicMessage(I2PAppContext context) { super(context); - setData(null); } public byte[] getData() { diff --git a/router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java b/router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java index 814443cb0..00493c9b4 100644 --- a/router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java +++ b/router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java @@ -33,7 +33,6 @@ public class I2NPMessageHandler { public I2NPMessageHandler(I2PAppContext context) { _context = context; _log = context.logManager().getLog(I2NPMessageHandler.class); - _messageBuffer = null; _lastSize = -1; } diff --git a/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java b/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java index 6dd63a6ab..108ee0eb0 100644 --- a/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java +++ b/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java @@ -54,8 +54,6 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM _log = context.logManager().getLog(I2NPMessageImpl.class); _expiration = _context.clock().now() + DEFAULT_EXPIRATION_MS; _uniqueId = _context.random().nextLong(MAX_ID_VALUE); - _written = false; - _read = false; //_context.statManager().createRateStat("i2np.writeTime", "How long it takes to write an I2NP message", "I2NP", new long[] { 10*60*1000, 60*60*1000 }); //_context.statManager().createRateStat("i2np.readTime", "How long it takes to read an I2NP message", "I2NP", new long[] { 10*60*1000, 60*60*1000 }); } diff --git a/router/java/src/net/i2p/router/JobImpl.java b/router/java/src/net/i2p/router/JobImpl.java index 38aa86025..b122d3674 100644 --- a/router/java/src/net/i2p/router/JobImpl.java +++ b/router/java/src/net/i2p/router/JobImpl.java @@ -24,8 +24,6 @@ public abstract class JobImpl implements Job { _context = context; _timing = new JobTiming(context); _id = ++_idSrc; - _addedBy = null; - _madeReadyOn = 0; } public long getJobId() { return _id; } diff --git a/router/java/src/net/i2p/router/JobStats.java b/router/java/src/net/i2p/router/JobStats.java index 148fb7410..19362cff3 100644 --- a/router/java/src/net/i2p/router/JobStats.java +++ b/router/java/src/net/i2p/router/JobStats.java @@ -15,11 +15,8 @@ class JobStats { public JobStats(String name) { _job = name; - _numRuns = 0; - _totalTime = 0; _maxTime = -1; _minTime = -1; - _totalPendingTime = 0; _maxPendingTime = -1; _minPendingTime = -1; } diff --git a/router/java/src/net/i2p/router/JobTiming.java b/router/java/src/net/i2p/router/JobTiming.java index 366587eaa..d979074a6 100644 --- a/router/java/src/net/i2p/router/JobTiming.java +++ b/router/java/src/net/i2p/router/JobTiming.java @@ -23,8 +23,6 @@ public class JobTiming implements Clock.ClockUpdateListener { public JobTiming(RouterContext context) { _context = context; _start = context.clock().now(); - _actualStart = 0; - _actualEnd = 0; //context.clock().addUpdateListener(this); } diff --git a/router/java/src/net/i2p/router/OutNetMessage.java b/router/java/src/net/i2p/router/OutNetMessage.java index 10aa6ec15..72f262cc5 100644 --- a/router/java/src/net/i2p/router/OutNetMessage.java +++ b/router/java/src/net/i2p/router/OutNetMessage.java @@ -66,18 +66,8 @@ public class OutNetMessage { public OutNetMessage(RouterContext context) { _context = context; _log = context.logManager().getLog(OutNetMessage.class); - setTarget(null); - _message = null; - _messageSize = 0; setPriority(-1); setExpiration(-1); - setOnSendJob(null); - setOnFailedSendJob(null); - setOnReplyJob(null); - setOnFailedReplyJob(null); - setReplySelector(null); - _failedTransports = null; - _sendBegin = 0; //_createdBy = new Exception("Created by"); _created = context.clock().now(); timestamp("Created"); diff --git a/router/java/src/net/i2p/router/TunnelPoolSettings.java b/router/java/src/net/i2p/router/TunnelPoolSettings.java index ceb3814a9..ae894cf14 100644 --- a/router/java/src/net/i2p/router/TunnelPoolSettings.java +++ b/router/java/src/net/i2p/router/TunnelPoolSettings.java @@ -60,12 +60,7 @@ public class TunnelPoolSettings { _duration = DEFAULT_DURATION; _length = DEFAULT_LENGTH; _lengthVariance = DEFAULT_LENGTH_VARIANCE; - _lengthOverride = 0; _allowZeroHop = DEFAULT_ALLOW_ZERO_HOP; - _isInbound = false; - _isExploratory = false; - _destination = null; - _destinationNickname = null; _IPRestriction = DEFAULT_IP_RESTRICTION; _unknownOptions = new Properties(); _randomKey = generateRandomKey();