antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Rewrote equals() to do without a try/catch statement.

Browse source
This commit is contained in:
hns 2002-09-05 13:38:15 +00:00
parent d1e173039b
commit 2f74c6cc03
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/helma/objectmodel/db/DbKey.java
View file

@ -37,13 +37,12 @@ public final class DbKey implements Key, Serializable {
public boolean equals (Object what) { public boolean equals (Object what) {
if (what == this) if (what == this)
return true; return true;
try { if (!(what instanceof DbKey))
DbKey k = (DbKey) what;
return (storageName == k.storageName || storageName.equals (k.storageName)) &&
(id == k.id || id.equals (k.id));
} catch (Exception x) {
return false; return false;
} DbKey k = (DbKey) what;
// storageName is an interned string (by DbMapping, from where we got it)
// so we can compare by using == instead of the equals method.
return storageName == k.storageName && (id == k.id || id.equals (k.id));
} }
public int hashCode () { public int hashCode () {

10
src/helma/objectmodel/db/SyntheticKey.java
View file

@ -32,13 +32,11 @@ public final class SyntheticKey implements Key, Serializable {
public boolean equals (Object what) { public boolean equals (Object what) {
if (what == this) if (what == this)
return true; return true;
try { if (!(what instanceof SyntheticKey))
SyntheticKey k = (SyntheticKey) what;
return parentKey.equals (k.parentKey) &&
(name == k.name || name.equals (k.name));
} catch (Exception x) {
return false; return false;
} SyntheticKey k = (SyntheticKey) what;
return parentKey.equals (k.parentKey) &&
(name == k.name || name.equals (k.name));
} }
public int hashCode () { public int hashCode () {