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

diff --git a/java/src/IceInternal/ProxyBatchOutgoingAsync.java b/java/src/IceInternal/ProxyBatchOutgoingAsync.java
index 77a82ae2772..15c4b26500f 100644
--- a/java/src/IceInternal/ProxyBatchOutgoingAsync.java
+++ b/java/src/IceInternal/ProxyBatchOutgoingAsync.java
@@ -44,7 +44,8 @@ public class ProxyBatchOutgoingAsync extends BatchOutgoingAsync
                         int invocationTimeout = handler.getReference().getInvocationTimeout();
                         if(invocationTimeout > 0)
                         {
-                            _instance.timer().schedule(this, invocationTimeout);
+                            _future = _instance.timer().schedule(this, invocationTimeout,
+                                java.util.concurrent.TimeUnit.MILLISECONDS);
                             _timeoutRequestHandler = handler;
                         }
                     }