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, 6 insertions, 4 deletions

diff --git a/java/src/IceInternal/BatchOutgoingAsync.java b/java/src/IceInternal/BatchOutgoingAsync.java
index 81dfe8a5a4c..072cd8d1b64 100644
--- a/java/src/IceInternal/BatchOutgoingAsync.java
+++ b/java/src/IceInternal/BatchOutgoingAsync.java
@@ -9,7 +9,7 @@
 
 package IceInternal;
 
-public class BatchOutgoingAsync extends Ice.AsyncResult implements OutgoingAsyncMessageCallback, TimerTask
+public class BatchOutgoingAsync extends Ice.AsyncResult implements OutgoingAsyncMessageCallback, Runnable
 {
     public BatchOutgoingAsync(Ice.Communicator communicator, Instance instance, String operation, CallbackBase callback)
     {
@@ -43,7 +43,8 @@ public class BatchOutgoingAsync extends Ice.AsyncResult implements OutgoingAsync
             }
             if(_timeoutRequestHandler != null)
             {
-                _instance.timer().cancel(this);
+                _future.cancel(false);
+                _future = null;
                 _timeoutRequestHandler = null;
             }
             _monitor.notifyAll();
@@ -70,7 +71,8 @@ public class BatchOutgoingAsync extends Ice.AsyncResult implements OutgoingAsync
             }
             if(_timeoutRequestHandler != null)
             {
-                _instance.timer().cancel(this);
+                _future.cancel(false);
+                _future = null;
                 _timeoutRequestHandler = null;
             }
         }
@@ -92,7 +94,7 @@ public class BatchOutgoingAsync extends Ice.AsyncResult implements OutgoingAsync
     }
 
     public void 
-    runTimerTask()
+    run()
     {
         __runTimerTask();
     }