ICE-4234 - Update Ice to use current Java threading constructs

- Use ScheduledThreadPoolDispatcher not IceUtilInternal.Timer.
- Use Ice timer in glacier2, Freeze impl.
- Align C++, C# with java changes.
- Database demo now supports mariadb.

1 files changed, 1 insertions, 2 deletions

diff --git a/java/src/IceInternal/RetryQueue.java b/java/src/IceInternal/RetryQueue.java
index 864a2b8fb2e..6a6de427dfe 100644
--- a/java/src/IceInternal/RetryQueue.java
+++ b/java/src/IceInternal/RetryQueue.java
@@ -20,7 +20,7 @@ public class RetryQueue
     add(OutgoingAsync outAsync, int interval)
     {
         RetryTask task = new RetryTask(this, outAsync);
-        _instance.timer().schedule(task, interval);
+        task.setFuture(_instance.timer().schedule(task, interval, java.util.concurrent.TimeUnit.MILLISECONDS));
         _requests.add(task);
     }
 
@@ -29,7 +29,6 @@ public class RetryQueue
     {
         for(RetryTask task : _requests)
         {
-            _instance.timer().cancel(task);
             task.destroy();
         }
         _requests.clear();