Merge remote-tracking branch 'origin/jetty-8'

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
This commit is contained in:
Jan Bartel 2013-05-16 12:33:08 +10:00
commit 76b767fc22
1 changed files with 3 additions and 3 deletions

View File

@ -580,11 +580,11 @@ public class JDBCSessionIdManager extends AbstractSessionIdManager
@Override
public void doStart()
throws Exception
{
{
initializeDatabase();
prepareTables();
prepareTables();
super.doStart();
if (LOG.isDebugEnabled())
if (LOG.isDebugEnabled())
LOG.debug("Scavenging interval = "+getScavengeInterval()+" sec");
_timer=new Timer("JDBCSessionScavenger", true);
setScavengeInterval(getScavengeInterval());