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, 69 insertions, 0 deletions

diff --git a/java/demo/Ice/session/ReapTask.java b/java/demo/Ice/session/ReapTask.java
new file mode 100644
index 00000000000..39b8bb1fad5
--- /dev/null
+++ b/java/demo/Ice/session/ReapTask.java
@@ -0,0 +1,69 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+import Demo.*;
+
+class ReapTask implements Runnable
+{ 
+    static class SessionProxyPair
+    {
+        SessionProxyPair(Demo.SessionPrx p, SessionI s)
+        {
+            proxy = p;
+            session = s;
+        }
+
+        Demo.SessionPrx proxy;
+        SessionI session;
+    }
+
+    synchronized public void
+    run()
+    {
+        java.util.Iterator<SessionProxyPair> p = _sessions.iterator();
+        while(p.hasNext())
+        {
+            SessionProxyPair s = p.next();
+            try
+            {
+                //
+                // Session destruction may take time in a
+                // real-world example. Therefore the current time
+                // is computed for each iteration.
+                //
+                if((System.currentTimeMillis() - s.session.timestamp()) > _timeout)
+                {
+                    String name = s.proxy.getName();
+                    s.proxy.destroy();
+                    System.out.println("The session " + name + " has timed out.");
+                    p.remove();
+                }
+            }
+            catch(Ice.ObjectNotExistException e)
+            {
+                p.remove();
+            }
+        }
+    }
+
+    synchronized public void
+    terminate()
+    {
+        _sessions.clear();
+    }
+
+    synchronized public void
+    add(SessionPrx proxy, SessionI session)
+    {
+        _sessions.add(new SessionProxyPair(proxy, session));
+    }
+
+    private final long _timeout = 10 * 1000; // 10 seconds.
+    private java.util.List<SessionProxyPair> _sessions = new java.util.LinkedList<SessionProxyPair>();
+}