Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR #9878 - fixes for test failures 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2023-06-14 11:41:24 +10:00
parent a67e48d1ee
commit 4c1cf7de64
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ContextHandler.java
View File

@ -610,16 +610,13 @@ public class ContextHandler extends ScopedHandler implements Attributes, Supplie
{
throw new RuntimeException(e);
}
finally
{
_coreContextHandler.removeEventListener(this);
}
}
@Override
public void lifeCycleStarted(LifeCycle event)
{
_coreContextHandler.manage(this);
_coreContextHandler.removeEventListener(this);
}
});
@ -669,16 +666,13 @@ public class ContextHandler extends ScopedHandler implements Attributes, Supplie
{
throw new RuntimeException(e);
}
finally
{
_coreContextHandler.removeEventListener(this);
}
}
@Override
public void lifeCycleStopped(LifeCycle event)
{
_coreContextHandler.manage(this);
_coreContextHandler.removeEventListener(this);
}
});
@ -879,7 +873,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Supplie
else
context.call(() -> nextScope(target, baseRequest, request, response), baseRequest.getCoreRequest());
}
catch (IOException | ServletException e)
catch (IOException | ServletException | RuntimeException e)
{
throw e;
}

5
jetty-ee9/jetty-ee9-webapp/src/main/java/org/eclipse/jetty/ee9/webapp/WebAppContext.java
View File

@ -503,6 +503,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
@Override
protected void doStart() throws Exception
{
ClassLoader old = Thread.currentThread().getContextClassLoader();
try
{
_metadata.setAllowDuplicateFragmentNames(isAllowDuplicateFragmentNames());
@ -526,6 +527,10 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
if (isThrowUnavailableOnStartupException())
throw t;
}
finally
{
Thread.currentThread().setContextClassLoader(old);
}
}
private void wrapConfigurations()