diff options
| author | Greg Wilkins | 2010-04-20 21:11:18 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2010-04-20 21:11:18 +0000 |
| commit | 4d20d654551b1d42aee1338d3392e4740919e0ee (patch) | |
| tree | b3c70e0a483d6579eb5bf65b14e55853268b3835 /jetty-servlet/src/main | |
| parent | 44d54e222a9a6203c7dea323b92552ee3867ef39 (diff) | |
| download | org.eclipse.jetty.project-4d20d654551b1d42aee1338d3392e4740919e0ee.tar.gz org.eclipse.jetty.project-4d20d654551b1d42aee1338d3392e4740919e0ee.tar.xz org.eclipse.jetty.project-4d20d654551b1d42aee1338d3392e4740919e0ee.zip | |
JETTY-903 Stop both caches
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1532 7e9141cc-0065-0410-87d8-b60c137991c4
Diffstat (limited to 'jetty-servlet/src/main')
| -rw-r--r-- | jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java index c2d32241ea..fc094ddf19 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java @@ -940,8 +940,6 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory { if (_nioCache!=null) _nioCache.stop(); - if (_bioCache!=null) - _bioCache.stop(); } catch(Exception e) { @@ -949,7 +947,19 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory } finally { - super.destroy(); + try + { + if (_bioCache!=null) + _bioCache.stop(); + } + catch(Exception e) + { + Log.warn(Log.EXCEPTION,e); + } + finally + { + super.destroy(); + } } } |