diff options
| author | Michael Gorovoy | 2010-06-04 15:45:41 +0000 |
|---|---|---|
| committer | Michael Gorovoy | 2010-06-04 15:45:41 +0000 |
| commit | 2c7f0f9372e09c5e486e0d6de99538bf318f125b (patch) | |
| tree | af1ecdc9e870a09f42532a06d3a1d63bcc8def35 /jetty-servlet/src/main | |
| parent | b3c156a9885bf8c4f965cf49fa569258a9d2e561 (diff) | |
| download | org.eclipse.jetty.project-2c7f0f9372e09c5e486e0d6de99538bf318f125b.tar.gz org.eclipse.jetty.project-2c7f0f9372e09c5e486e0d6de99538bf318f125b.tar.xz org.eclipse.jetty.project-2c7f0f9372e09c5e486e0d6de99538bf318f125b.zip | |
revert r1915
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1920 7e9141cc-0065-0410-87d8-b60c137991c4
Diffstat (limited to 'jetty-servlet/src/main')
| -rw-r--r-- | jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java index fcc4d3a790..ba2494f42b 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java @@ -53,7 +53,6 @@ import org.eclipse.jetty.util.LazyList; import org.eclipse.jetty.util.MultiException; import org.eclipse.jetty.util.MultiMap; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.component.Container; import org.eclipse.jetty.util.log.Log; /* --------------------------------------------------------------------- */ @@ -662,23 +661,11 @@ public class ServletHandler extends ScopedHandler { MultiException mx = new MultiException(); - Container beanContainer = getServer()==null? null: getServer().getContainer(); - // Start filters if (_filters!=null) { for (int i=0;i<_filters.length; i++) - { _filters[i].start(); - if (beanContainer != null) - { - Filter filter = _filters[i].getFilter(); - if (filter != null && filter.getClass().getName().startsWith("org.eclipse.jetty.")) - { - beanContainer.addBean(filter); - } - } - } } if (_servlets!=null) @@ -702,14 +689,6 @@ public class ServletHandler extends ScopedHandler } servlets[i].start(); - if (beanContainer != null) - { - Servlet servlet = servlets[i].getServletInstance(); - if (servlet != null && servlet.getClass().getName().startsWith("org.eclipse.jetty.")) - { - beanContainer.addBean(servlet); - } - } } catch(Throwable e) { |