add Glacier2 support.

1 files changed, 23 insertions, 1 deletions

diff --git a/java/demo/Database/library/ReapThread.java b/java/demo/Database/library/ReapThread.java
index 5bef3cd3c50..0735f3d243e 100644
--- a/java/demo/Database/library/ReapThread.java
+++ b/java/demo/Database/library/ReapThread.java
@@ -15,10 +15,19 @@ class ReapThread extends Thread
     {
         SessionProxyPair(Demo.SessionPrx p, SessionI s)
         {
+            glacier2proxy = null;
             proxy = p;
             session = s;
         }
 
+        SessionProxyPair(Glacier2.SessionPrx p, SessionI s)
+        {
+            glacier2proxy = p;
+            proxy = null;
+            session = s;
+        }
+
+        Glacier2.SessionPrx glacier2proxy;
         Demo.SessionPrx proxy;
         SessionI session;
     }
@@ -57,7 +66,14 @@ class ReapThread extends Thread
                         if((System.currentTimeMillis() - s.session.timestamp()) > _timeout)
                         {
                             _logger.trace("ReapThread", "The session " + s.proxy.ice_getIdentity() + " has timed out.");
-                            s.proxy.destroy();
+                            if(s.proxy != null)
+                            {
+                                s.proxy.destroy();
+                            }
+                            else
+                            {
+                                s.glacier2proxy.destroy();
+                            }
                             p.remove();
                         }
                     }
@@ -95,6 +111,12 @@ class ReapThread extends Thread
         _sessions.add(new SessionProxyPair(proxy, session));
     }
 
+    synchronized public void
+    add(Glacier2.SessionPrx proxy, SessionI session)
+    {
+        _sessions.add(new SessionProxyPair(proxy, session));
+    }
+
     private final long _timeout = 10 * 1000; // 10 seconds.
     private Ice.Logger _logger;
     private boolean _terminated = false;