summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2009-05-28 11:20:11 -0230
committerDwayne Boone <dwayne@zeroc.com>2009-05-28 11:20:11 -0230
commit3252234367c97c8e893edbfda83d093ee7ce4abb (patch)
tree265eba89a7c9888b646a52f042ef72b2190c69a9
parentBug 3502 - Forgot to add CHANGES entry. Fixed incorrect (diff)
downloadice-3252234367c97c8e893edbfda83d093ee7ce4abb.tar.bz2
ice-3252234367c97c8e893edbfda83d093ee7ce4abb.tar.xz
ice-3252234367c97c8e893edbfda83d093ee7ce4abb.zip
Fixed C# Timer
-rw-r--r--CHANGES2
-rw-r--r--cs/src/Ice/Timer.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index a6b077beaab..22fa20c9043 100644
--- a/CHANGES
+++ b/CHANGES
@@ -150,7 +150,7 @@ C++ Changes
============
- Added ice_stackTrace() method to Exception classes, which returns the
- exception stack trace on platforms/compiler that support it.
+ exception stack trace on platforms/compilers that support it.
Currently this is only supported with GCC compiler.
- Removed AMD_Array_Object_ice_invoke class and instead add ice_response
diff --git a/cs/src/Ice/Timer.cs b/cs/src/Ice/Timer.cs
index f0ccc01a90c..7cf4cc66bfc 100644
--- a/cs/src/Ice/Timer.cs
+++ b/cs/src/Ice/Timer.cs
@@ -305,7 +305,7 @@ namespace IceInternal
public TimerTask task;
}
- private IDictionary<Token, object> _tokens = new Dictionary<Token, object>();
+ private IDictionary<Token, object> _tokens = new SortedDictionary<Token, object>();
private IDictionary<TimerTask, Token> _tasks = new Dictionary<TimerTask, Token>();
private Instance _instance;
private long _wakeUpTime = System.Int64.MaxValue;