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

diff --git a/java/demo/Database/library/SessionFactoryI.java b/java/demo/Database/library/SessionFactoryI.java
index bf954a89774..b3c3606719a 100644
--- a/java/demo/Database/library/SessionFactoryI.java
+++ b/java/demo/Database/library/SessionFactoryI.java
@@ -33,7 +33,7 @@ class SessionFactoryI extends _SessionFactoryDisp
         return _timeout;
     }
 
-    SessionFactoryI(Ice.Logger logger, ReapThread reaper, long timeout)
+    SessionFactoryI(Ice.Logger logger, ReapTask reaper, long timeout)
     {
         _logger = logger;
         _reaper = reaper;
@@ -41,6 +41,6 @@ class SessionFactoryI extends _SessionFactoryDisp
     }
 
     private Ice.Logger _logger;
-    private ReapThread _reaper;
+    private ReapTask _reaper;
     private long _timeout;
 }