summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/Timer.java
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2012-10-23 16:19:38 -0400
committerBernard Normier <bernard@zeroc.com>2012-10-23 16:19:38 -0400
commitada25bad3511a359eb28cf48f018d6a42e166f10 (patch)
tree430749f887a1c6f708c2d4a23b3e3ec4ef18ef2c /java/src/IceInternal/Timer.java
parentRuby 1.8 fix (diff)
downloadice-ada25bad3511a359eb28cf48f018d6a42e166f10.tar.bz2
ice-ada25bad3511a359eb28cf48f018d6a42e166f10.tar.xz
ice-ada25bad3511a359eb28cf48f018d6a42e166f10.zip
Fixed ICE-4855: expand tabs to space (8) for .php, .cpp, .h, .java and .cs files
Diffstat (limited to 'java/src/IceInternal/Timer.java')
-rw-r--r--java/src/IceInternal/Timer.java38
1 files changed, 19 insertions, 19 deletions
diff --git a/java/src/IceInternal/Timer.java b/java/src/IceInternal/Timer.java
index fe643e1e089..03a180d7f3f 100644
--- a/java/src/IceInternal/Timer.java
+++ b/java/src/IceInternal/Timer.java
@@ -290,25 +290,25 @@ 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;
- }
+ 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.