diff --git a/core/java/src/net/i2p/data/ByteArray.java b/core/java/src/net/i2p/data/ByteArray.java index d013809c8..1801b122e 100644 --- a/core/java/src/net/i2p/data/ByteArray.java +++ b/core/java/src/net/i2p/data/ByteArray.java @@ -66,6 +66,7 @@ public class ByteArray implements Serializable, Comparable { @Override public final boolean equals(Object o) { + if (o == this) return true; if (o == null) return false; if (o instanceof ByteArray) { ByteArray ba = (ByteArray)o; diff --git a/core/java/src/net/i2p/data/Certificate.java b/core/java/src/net/i2p/data/Certificate.java index c6d7c61b2..5c61df047 100644 --- a/core/java/src/net/i2p/data/Certificate.java +++ b/core/java/src/net/i2p/data/Certificate.java @@ -177,6 +177,7 @@ public class Certificate extends DataStructureImpl { @Override public boolean equals(Object object) { + if (object == this) return true; if ((object == null) || !(object instanceof Certificate)) return false; Certificate cert = (Certificate) object; return _type == cert.getCertificateType() && DataHelper.eq(_payload, cert.getPayload()); diff --git a/core/java/src/net/i2p/data/DateAndFlags.java b/core/java/src/net/i2p/data/DateAndFlags.java index 72e33c707..24de09e36 100644 --- a/core/java/src/net/i2p/data/DateAndFlags.java +++ b/core/java/src/net/i2p/data/DateAndFlags.java @@ -116,6 +116,7 @@ public class DateAndFlags extends DataStructureImpl { @Override public boolean equals(Object object) { + if (object == this) return true; if ((object == null) || !(object instanceof DateAndFlags)) return false; DateAndFlags daf = (DateAndFlags) object; return _date == daf._date && _flags == daf._flags; diff --git a/core/java/src/net/i2p/data/KeysAndCert.java b/core/java/src/net/i2p/data/KeysAndCert.java index ef772880b..933eaa55e 100644 --- a/core/java/src/net/i2p/data/KeysAndCert.java +++ b/core/java/src/net/i2p/data/KeysAndCert.java @@ -83,6 +83,7 @@ public class KeysAndCert extends DataStructureImpl { @Override public boolean equals(Object object) { + if (object == this) return true; if ((object == null) || !(object instanceof KeysAndCert)) return false; KeysAndCert ident = (KeysAndCert) object; return DataHelper.eq(_certificate, ident._certificate) diff --git a/core/java/src/net/i2p/data/Lease.java b/core/java/src/net/i2p/data/Lease.java index d6c97f150..93be652fd 100644 --- a/core/java/src/net/i2p/data/Lease.java +++ b/core/java/src/net/i2p/data/Lease.java @@ -137,6 +137,7 @@ public class Lease extends DataStructureImpl { @Override public boolean equals(Object object) { + if (object == this) return true; if ((object == null) || !(object instanceof Lease)) return false; Lease lse = (Lease) object; return DataHelper.eq(_end, lse.getEndDate()) diff --git a/core/java/src/net/i2p/data/LeaseSet.java b/core/java/src/net/i2p/data/LeaseSet.java index f2a596d88..ef259411d 100644 --- a/core/java/src/net/i2p/data/LeaseSet.java +++ b/core/java/src/net/i2p/data/LeaseSet.java @@ -324,6 +324,7 @@ public class LeaseSet extends DatabaseEntry { @Override public boolean equals(Object object) { + if (object == this) return true; if ((object == null) || !(object instanceof LeaseSet)) return false; LeaseSet ls = (LeaseSet) object; return DataHelper.eq(getEncryptionKey(), ls.getEncryptionKey()) && diff --git a/core/java/src/net/i2p/data/Payload.java b/core/java/src/net/i2p/data/Payload.java index 290640459..f5bda2c31 100644 --- a/core/java/src/net/i2p/data/Payload.java +++ b/core/java/src/net/i2p/data/Payload.java @@ -105,6 +105,7 @@ public class Payload extends DataStructureImpl { @Override public boolean equals(Object object) { + if (object == this) return true; if ((object == null) || !(object instanceof Payload)) return false; Payload p = (Payload) object; return DataHelper.eq(_unencryptedData, p.getUnencryptedData()) diff --git a/core/java/src/net/i2p/data/PrivateKey.java b/core/java/src/net/i2p/data/PrivateKey.java index 5b0a5e4bb..a37f9e119 100644 --- a/core/java/src/net/i2p/data/PrivateKey.java +++ b/core/java/src/net/i2p/data/PrivateKey.java @@ -70,6 +70,7 @@ public class PrivateKey extends SimpleDataStructure { @Override public boolean equals(Object obj) { + if (obj == this) return true; if ((obj == null) || !(obj instanceof PrivateKey)) return false; return DataHelper.eq(_data, ((PrivateKey) obj)._data); } diff --git a/core/java/src/net/i2p/data/RouterAddress.java b/core/java/src/net/i2p/data/RouterAddress.java index 016332b0b..768673f9f 100644 --- a/core/java/src/net/i2p/data/RouterAddress.java +++ b/core/java/src/net/i2p/data/RouterAddress.java @@ -225,6 +225,7 @@ public class RouterAddress extends DataStructureImpl { @Override public boolean equals(Object object) { + if (object == this) return true; if ((object == null) || !(object instanceof RouterAddress)) return false; RouterAddress addr = (RouterAddress) object; // let's keep this fast as we are putting an address into the RouterInfo set frequently diff --git a/core/java/src/net/i2p/data/RouterInfo.java b/core/java/src/net/i2p/data/RouterInfo.java index ec2ac0832..662f6b740 100644 --- a/core/java/src/net/i2p/data/RouterInfo.java +++ b/core/java/src/net/i2p/data/RouterInfo.java @@ -588,6 +588,7 @@ public class RouterInfo extends DatabaseEntry { @Override public boolean equals(Object object) { + if (object == this) return true; if ((object == null) || !(object instanceof RouterInfo)) return false; RouterInfo info = (RouterInfo) object; return DataHelper.eq(_identity, info.getIdentity()) diff --git a/core/java/src/net/i2p/data/SimpleDataStructure.java b/core/java/src/net/i2p/data/SimpleDataStructure.java index cdd1e242a..0ef2afc7d 100644 --- a/core/java/src/net/i2p/data/SimpleDataStructure.java +++ b/core/java/src/net/i2p/data/SimpleDataStructure.java @@ -182,6 +182,7 @@ public abstract class SimpleDataStructure extends DataStructureImpl { */ @Override public boolean equals(Object obj) { + if (obj == this) return true; if ((obj == null) || !(obj instanceof SimpleDataStructure)) return false; return DataHelper.eq(_data, ((SimpleDataStructure) obj)._data); } diff --git a/core/java/src/net/i2p/data/TunnelId.java b/core/java/src/net/i2p/data/TunnelId.java index 81f49a35f..d058d6374 100644 --- a/core/java/src/net/i2p/data/TunnelId.java +++ b/core/java/src/net/i2p/data/TunnelId.java @@ -72,6 +72,7 @@ public class TunnelId extends DataStructureImpl { @Override public boolean equals(Object obj) { + if (obj == this) return true; if ( (obj == null) || !(obj instanceof TunnelId)) return false; return _tunnelId == ((TunnelId)obj)._tunnelId;