Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #5378 Setting Holders during STARTING #5397

Merged
merged 2 commits into from Oct 7, 2020
Merged

Fixes #5378 Setting Holders during STARTING #5397

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a1cada
Fixes #5378 Setting Holders during STARTING
gregw Oct 5, 2020
9e1e098
Fixes #5378 Setting Holders during STARTING
gregw Oct 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
57 changes: 28 additions & 29 deletions jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
View file
Open in desktop
Expand Up @@ -773,6 +773,29 @@ public boolean isInitialized()
return _initialized;
}

protected void initializeHolders(BaseHolder<?>[] holders)
{
for (BaseHolder<?> holder : holders)
{
holder.setServletHandler(this);
if (isInitialized())
{
try
{
if (!holder.isStarted())
{
holder.start();
holder.initialize();
}
}
catch (Exception e)
{
throw new RuntimeException(e);
}
}
}
}

/**
* @return whether the filter chains are cached.
*/
Expand Down Expand Up @@ -800,10 +823,7 @@ public ListenerHolder[] getListeners()
public void setListeners(ListenerHolder[] listeners)
{
if (listeners != null)
for (ListenerHolder holder : listeners)
{
holder.setServletHandler(this);
}
initializeHolders(listeners);
gregw marked this conversation as resolved.
Show resolved Hide resolved
updateBeans(_listeners,listeners);
_listeners = listeners;
}
Expand Down Expand Up @@ -865,9 +885,6 @@ public void addServletWithMapping(ServletHolder servlet, String pathSpec)
{
Objects.requireNonNull(servlet);
ServletHolder[] holders = getServlets();
if (holders != null)
holders = holders.clone();

try
{
synchronized (this)
Expand Down Expand Up @@ -979,8 +996,6 @@ public void addFilterWithMapping(FilterHolder holder, String pathSpec, EnumSet<D
{
Objects.requireNonNull(holder);
FilterHolder[] holders = getFilters();
if (holders != null)
holders = holders.clone();

try
{
Expand Down Expand Up @@ -1435,16 +1450,6 @@ else if (isAllowDuplicateMappings())
LOG.debug("servletPathMap=" + _servletPathMap);
LOG.debug("servletNameMap=" + _servletNameMap);
}

try
{
if (_contextHandler != null && _contextHandler.isStarted() || _contextHandler == null && isStarted())
initialize();
}
catch (Exception e)
{
throw new RuntimeException(e);
}
}

protected void notFound(Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
Expand Down Expand Up @@ -1496,18 +1501,15 @@ public void setFilterMappings(FilterMapping[] filterMappings)
{
updateBeans(_filterMappings,filterMappings);
_filterMappings = filterMappings;
if (isStarted())
if (isRunning())
updateMappings();
invalidateChainsCache();
}

public synchronized void setFilters(FilterHolder[] holders)
{
if (holders != null)
for (FilterHolder holder : holders)
{
holder.setServletHandler(this);
}
initializeHolders(holders);
updateBeans(_filters,holders);
_filters = holders;
updateNameMappings();
Expand All @@ -1521,7 +1523,7 @@ public void setServletMappings(ServletMapping[] servletMappings)
{
updateBeans(_servletMappings,servletMappings);
_servletMappings = servletMappings;
if (isStarted())
if (isRunning())
updateMappings();
invalidateChainsCache();
}
Expand All @@ -1534,10 +1536,7 @@ public void setServletMappings(ServletMapping[] servletMappings)
public synchronized void setServlets(ServletHolder[] holders)
{
if (holders != null)
for (ServletHolder holder : holders)
{
holder.setServletHandler(this);
}
initializeHolders(holders);
updateBeans(_servlets,holders);
_servlets = holders;
updateNameMappings();
Expand Down
24 changes: 19 additions & 5 deletions jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletContextHandlerTest.java
View file
Open in desktop
Expand Up @@ -1651,21 +1651,35 @@ public void testProgrammaticFilterServlet() throws Exception
ServletHandler handler = new ServletHandler();
_server.setHandler(context);
context.setHandler(handler);
handler.addServletWithMapping(new ServletHolder(new TestServlet()), "/");
handler.addServletWithMapping(new ServletHolder(new TestServlet()
{
@Override
public void init() throws ServletException
{
handler.addFilterWithMapping(new FilterHolder(new MyFilter()), "/test/*", EnumSet.of(DispatcherType.REQUEST));
gregw marked this conversation as resolved.
Show resolved Hide resolved
}
}), "/test");
gregw marked this conversation as resolved.
Show resolved Hide resolved

_server.start();


String request =
"GET /hello HTTP/1.0\n" +
"GET /test HTTP/1.0\n" +
"Host: localhost\n" +
"\n";
String response = _connector.getResponse(request);
assertThat(response, containsString("200 OK"));
assertThat(response, containsString("filter: filter"));
assertThat(response, containsString("Test"));

handler.addFilterWithMapping(new FilterHolder(new MyFilter()), "/*", EnumSet.of(DispatcherType.REQUEST));
handler.addServletWithMapping(new ServletHolder(new HelloServlet()), "/hello/*");

handler.addServletWithMapping(new ServletHolder(new HelloServlet()
{
@Override
public void init() throws ServletException
{
handler.addFilterWithMapping(new FilterHolder(new MyFilter()), "/hello/*", EnumSet.of(DispatcherType.REQUEST));
}
}), "/hello/*");

_server.dumpStdErr();
gregw marked this conversation as resolved.
Show resolved Hide resolved

Expand Down