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

This commit is contained in:
Jan Bartel 2013-05-06 13:22:26 +10:00
commit 488c1755e0
1 changed files with 13 additions and 10 deletions

View File

@ -296,17 +296,20 @@ public class JDBCSessionManager extends AbstractSessionManager
super.complete(); super.complete();
try try
{ {
if (_dirty) if (isValid())
{ {
//The session attributes have changed, write to the db, ensuring if (_dirty)
//http passivation/activation listeners called {
willPassivate(); //The session attributes have changed, write to the db, ensuring
updateSession(this); //http passivation/activation listeners called
didActivate(); willPassivate();
} updateSession(this);
else if ((getAccessed() - _lastSaved) >= (getSaveInterval() * 1000L)) didActivate();
{ }
updateSessionAccessTime(this); else if ((getAccessed() - _lastSaved) >= (getSaveInterval() * 1000L))
{
updateSessionAccessTime(this);
}
} }
} }
catch (Exception e) catch (Exception e)