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

Fix #11553 restore startWebapp #11554

Merged
merged 1 commit into from
Mar 22, 2024
Merged

Fix #11553 restore startWebapp #11554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/WebAppContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1220,14 +1220,14 @@ protected void startContext()
{
//resolve the metadata
_metadata.resolve(this);
super.startContext();
startWebapp();
}
}

@Override
protected void stopContext() throws Exception
{
super.stopContext();
stopWebapp();
try
{
for (int i = _configurations.size(); i-- > 0; )
Expand All @@ -1253,6 +1253,24 @@ protected void stopContext() throws Exception
}
}

/**
* Continue the {@link #startContext()} before calling {@code super.startContext()}.
* @throws Exception If there was a problem starting
*/
protected void startWebapp() throws Exception
{
super.startContext();
}

/**
* Continue the {@link #stopContext()} before calling {@code super.stopContext()}.
* @throws Exception If there was a problem stopping
*/
protected void stopWebapp() throws Exception
{
super.stopContext();
}

@Override
public Set<String> setServletSecurity(Dynamic registration, ServletSecurityElement servletSecurityElement)
{
Expand Down
22 changes: 20 additions & 2 deletions jetty-ee9/jetty-ee9-webapp/src/main/java/org/eclipse/jetty/ee9/webapp/WebAppContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1294,14 +1294,14 @@ protected void startContext()
{
//resolve the metadata
_metadata.resolve(this);
super.startContext();
startWebapp();
}
}

@Override
protected void stopContext() throws Exception
{
super.stopContext();
stopWebapp();
try
{
for (int i = _configurations.size(); i-- > 0; )
Expand All @@ -1327,6 +1327,24 @@ protected void stopContext() throws Exception
}
}

/**
* Continue the {@link #startContext()} before calling {@code super.startContext()}.
* @throws Exception If there was a problem starting
*/
protected void startWebapp() throws Exception
{
super.startContext();
}

/**
* Continue the {@link #stopContext()} before calling {@code super.stopContext()}.
* @throws Exception If there was a problem stopping
*/
protected void stopWebapp() throws Exception
{
super.stopContext();
}

@Override
public Set<String> setServletSecurity(Dynamic registration, ServletSecurityElement servletSecurityElement)
{
Expand Down
Loading