diff options
| author | Jan Bartel | 2010-10-28 02:21:37 +0000 |
|---|---|---|
| committer | Jan Bartel | 2010-10-28 02:21:37 +0000 |
| commit | 25bfb476ee8db771ee5d6ca9ba49907125b09b33 (patch) | |
| tree | 36584b3fe28768afd2baa477dde10ef2adbca355 /jetty-servlet/src/main | |
| parent | e7fd61ed345c18f46b7736b8bbe5f33252d5d7c5 (diff) | |
| download | org.eclipse.jetty.project-25bfb476ee8db771ee5d6ca9ba49907125b09b33.tar.gz org.eclipse.jetty.project-25bfb476ee8db771ee5d6ca9ba49907125b09b33.tar.xz org.eclipse.jetty.project-25bfb476ee8db771ee5d6ca9ba49907125b09b33.zip | |
328885 - web overrides do not override
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2423 7e9141cc-0065-0410-87d8-b60c137991c4
Diffstat (limited to 'jetty-servlet/src/main')
| -rw-r--r-- | jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterHolder.java | 5 | ||||
| -rw-r--r-- | jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterHolder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterHolder.java index 9208b5f46f..cc584edce6 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterHolder.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterHolder.java @@ -36,6 +36,7 @@ public class FilterHolder extends Holder<Filter> /* ------------------------------------------------------------ */ private transient Filter _filter; private transient Config _config; + private transient FilterRegistration.Dynamic _registration; /* ---------------------------------------------------------------- */ /** Constructor @@ -158,7 +159,9 @@ public class FilterHolder extends Holder<Filter> /* ------------------------------------------------------------ */ public FilterRegistration.Dynamic getRegistration() { - return new Registration(); + if (_registration == null) + _registration = new Registration(); + return _registration; } /* ------------------------------------------------------------ */ diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java index abb63424f5..b7e6458c18 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java @@ -62,6 +62,7 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope private String _runAsRole; private RunAsToken _runAsToken; private IdentityService _identityService; + private ServletRegistration.Dynamic _registration; private transient Servlet _servlet; @@ -635,7 +636,9 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope public ServletRegistration.Dynamic getRegistration() { - return new Registration(); + if (_registration == null) + _registration = new Registration(); + return _registration; } /* -------------------------------------------------------- */ |