diff options
| author | Jan Bartel | 2016-01-06 00:22:18 +0000 |
|---|---|---|
| committer | Jan Bartel | 2016-01-06 00:22:18 +0000 |
| commit | 913ef1a39a27d06a48239738421cd982ef6edee9 (patch) | |
| tree | 2c5e22f6478bcb13991725666aa07ce9ebd89503 /jetty-server/src/main/java/org/eclipse/jetty | |
| parent | f519aa28fbb40a28fd244a4bb1d7f613a69eb80a (diff) | |
| download | org.eclipse.jetty.project-913ef1a39a27d06a48239738421cd982ef6edee9.tar.gz org.eclipse.jetty.project-913ef1a39a27d06a48239738421cd982ef6edee9.tar.xz org.eclipse.jetty.project-913ef1a39a27d06a48239738421cd982ef6edee9.zip | |
485064 HashSessionManager leaks ScheduledExecutorScheduler with reference to un-deployed webapp
Diffstat (limited to 'jetty-server/src/main/java/org/eclipse/jetty')
| -rw-r--r-- | jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java | 8 |
1 files changed, 6 insertions, 2 deletions
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 a54cac0931..68e5227e94 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 @@ -182,8 +182,13 @@ public class HashSessionManager extends AbstractSessionManager _saveTask=null; if (_task!=null) _task.cancel(); - + _task=null; + + //if we're managing our own timer, remove it + if (isManaged(_timer)) + removeBean(_timer); + _timer=null; } @@ -192,7 +197,6 @@ public class HashSessionManager extends AbstractSessionManager super.doStop(); _sessions.clear(); - } /* ------------------------------------------------------------ */ |