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, 9 insertions, 2 deletions

diff --git a/java/src/IceInternal/RetryTask.java b/java/src/IceInternal/RetryTask.java
index e1c44452448..6767526e9c1 100644
--- a/java/src/IceInternal/RetryTask.java
+++ b/java/src/IceInternal/RetryTask.java
@@ -9,7 +9,7 @@
 
 package IceInternal;
 
-class RetryTask implements TimerTask
+class RetryTask implements Runnable
 {
     RetryTask(RetryQueue queue, OutgoingAsync outAsync)
     {
@@ -18,7 +18,7 @@ class RetryTask implements TimerTask
     }
 
     public void
-    runTimerTask()
+    run()
     {
         if(_queue.remove(this))
         {
@@ -36,9 +36,16 @@ class RetryTask implements TimerTask
     public void
     destroy()
     {
+        _future.cancel(false);
         _outAsync.__invokeExceptionAsync(new Ice.CommunicatorDestroyedException());
     }
 
+    public void setFuture(java.util.concurrent.Future<?> future)
+    {
+        _future = future;
+    }
+
     private final RetryQueue _queue;
     private final OutgoingAsync _outAsync;
+    private java.util.concurrent.Future<?> _future;
 }