diff options
author | Michi Henning <michi@zeroc.com> | 2009-05-14 12:20:13 +1000 |
---|---|---|
committer | Michi Henning <michi@zeroc.com> | 2009-05-14 12:20:13 +1000 |
commit | 99e135fb44e7e011719dec95224c5ae6abeed42d (patch) | |
tree | 1788d53c5373b190ea6bdc3d3a53678c85c8152d /java/src/IceInternal/Timer.java | |
parent | Fixed incorrect string comparison (reference equality instead of string equal... (diff) | |
download | ice-99e135fb44e7e011719dec95224c5ae6abeed42d.tar.bz2 ice-99e135fb44e7e011719dec95224c5ae6abeed42d.tar.xz ice-99e135fb44e7e011719dec95224c5ae6abeed42d.zip |
Fixed a few more issues reported by FindBugs, mostly about inconsistencies with equals/hash.
Diffstat (limited to 'java/src/IceInternal/Timer.java')
-rw-r--r-- | java/src/IceInternal/Timer.java | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/java/src/IceInternal/Timer.java b/java/src/IceInternal/Timer.java index 87050899976..c7840bd339a 100644 --- a/java/src/IceInternal/Timer.java +++ b/java/src/IceInternal/Timer.java @@ -286,6 +286,26 @@ public final class Timer extends Thread return 0; } + public boolean + equals(Object obj) + { + if(this == obj) + { + return true; + } + if(obj instanceof Token) + { + return compareTo((Token)obj) == 0; + } + return false; + } + + public int + hashCode() + { + return id ^ (int)scheduledTime; + } + long scheduledTime; int id; // Since we can't compare references, we need to use another id. long delay; |