Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent 54d0944019 160385606c
commit 72310d0c03
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
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() public String getDriverClassName()
{ {
return _driverClassName; return _driverClassName;
@ -471,6 +481,9 @@ public class JDBCSessionIdManager extends AbstractSessionIdManager
private void initializeDatabase () private void initializeDatabase ()
throws Exception throws Exception
{ {
if (_datasource != null)
return; //already set up
if (_jndiName!=null) if (_jndiName!=null)
{ {
InitialContext ic = new InitialContext(); InitialContext ic = new InitialContext();