diff options
| author | Greg Wilkins | 2011-02-22 03:56:55 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2011-02-22 03:56:55 +0000 |
| commit | 22e142a8715cd92f844d9fbb340102f3062fede4 (patch) | |
| tree | 5e051e928ccc5073a96e557b3e14b0d615877ddb | |
| parent | 5dcd74cda5acbf703a459aaad1d945a7a4b70616 (diff) | |
| download | org.eclipse.jetty.project-22e142a8715cd92f844d9fbb340102f3062fede4.tar.gz org.eclipse.jetty.project-22e142a8715cd92f844d9fbb340102f3062fede4.tar.xz org.eclipse.jetty.project-22e142a8715cd92f844d9fbb340102f3062fede4.zip | |
337746 Fixed Session deIdle recursion
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2814 7e9141cc-0065-0410-87d8-b60c137991c4
| -rw-r--r-- | VERSION.txt | 1 | ||||
| -rw-r--r-- | jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/VERSION.txt b/VERSION.txt index 2763f6046a..88342e2350 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -12,6 +12,7 @@ jetty-7.3.1-SNAPSHOT + 337271 Flush SSL endpoint when dispatch thread held forever + 337678 Readded optional async connection mode for HttpClient + 337685 Work in progress on draft 5 websockets + + 337746 Fixed Session deIdle recursion + 337784 Improve HashSessionManager for session migrations + JETTY-1331 Allow alternate XML configuration processors (eg spring) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java index 67f036b7a9..54731e6244 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java @@ -726,6 +726,7 @@ public class HashSessionManager extends AbstractSessionManager { // Access now to prevent race with idling period access(System.currentTimeMillis()); + if (Log.isDebugEnabled()) { @@ -741,9 +742,9 @@ public class HashSessionManager extends AbstractSessionManager throw new FileNotFoundException(file.getName()); fis = new FileInputStream(file); + _idled = false; restoreSession(fis, this); - _idled = false; didActivate(); // If we are doing period saves, then there is no point deleting at this point |