Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project

This commit is contained in:
Greg Wilkins 2011-10-13 15:19:34 +11:00
commit 72310d0c03
1 changed files with 13 additions and 0 deletions

View File

@ -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();