Merge branch 'jdbc'

1 files changed, 9 insertions, 1 deletions

diff --git a/java/demo/Database/library/SessionFactoryI.java b/java/demo/Database/library/SessionFactoryI.java
index e2cb487e716..7d127d587d7 100644
--- a/java/demo/Database/library/SessionFactoryI.java
+++ b/java/demo/Database/library/SessionFactoryI.java
@@ -27,12 +27,20 @@ class SessionFactoryI extends _SessionFactoryDisp
         return proxy;
     }
 
-    SessionFactoryI(Ice.Logger logger, ReapThread reaper)
+    public long
+    getSessionTimeout(Ice.Current c)
+    {
+        return _timeout;
+    }
+
+    SessionFactoryI(Ice.Logger logger, ReapThread reaper, long timeout)
     {
         _logger = logger;
         _reaper = reaper;
+        _timeout = timeout;
     }
 
     private Ice.Logger _logger;
     private ReapThread _reaper;
+    private long _timeout;
 }