diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
index ad5b244d761..f9a01d68131 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
@@ -199,6 +199,16 @@ public class JDBCSessionIdManager extends AbstractSessionIdManager
     }
     
     
+    public void setDatasource (DataSource ds)
+    {
+        _datasource = ds;
+    }
+    
+    public DataSource getDataSource ()
+    {
+        return _datasource;
+    }
+    
     public String getDriverClassName()
     {
         return _driverClassName;
@@ -471,6 +481,9 @@ public class JDBCSessionIdManager extends AbstractSessionIdManager
     private void initializeDatabase ()
     throws Exception
     {
+        if (_datasource != null)
+            return; //already set up
+        
         if (_jndiName!=null)
         {
             InitialContext ic = new InitialContext();