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

Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x

This commit is contained in:
Jan Bartel 2020-08-24 17:40:28 +02:00
parent 77779ed6d8 f143babcf7
commit 80ad5f0333
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java
View File

@ -70,7 +70,6 @@ import org.slf4j.LoggerFactory;
public class DeploymentManager extends ContainerLifeCycle
{
private static final Logger LOG = LoggerFactory.getLogger(DeploymentManager.class);
private MultiException onStartupErrors;
/**
* Represents a single tracked app within the deployment manager.
@ -127,6 +126,7 @@ public class DeploymentManager extends ContainerLifeCycle
}
private final AutoLock _lock = new AutoLock();
private MultiException _onStartupErrors;
private final List<AppProvider> _providers = new ArrayList<AppProvider>();
private final AppLifeCycle _lifecycle = new AppLifeCycle();
private final Queue<AppEntry> _apps = new ConcurrentLinkedQueue<AppEntry>();
@ -251,9 +251,10 @@ public class DeploymentManager extends ContainerLifeCycle
startAppProvider(provider);
}
if (onStartupErrors != null)
try (AutoLock l = _lock.lock())
{
onStartupErrors.ifExceptionThrow();
if (_onStartupErrors != null)
_onStartupErrors.ifExceptionThrow();
}
super.doStart();
@ -546,6 +547,17 @@ public class DeploymentManager extends ContainerLifeCycle
}
}
private void addOnStartupError(Throwable cause)
{
try (AutoLock l = _lock.lock())
{
if (_onStartupErrors == null)
_onStartupErrors = new MultiException();
_onStartupErrors.add(cause);
}
}
/**
* Move an {@link App} through the {@link AppLifeCycle} to the desired {@link Node}, executing each lifecycle step
* in the process to reach the desired state.
@ -564,16 +576,6 @@ public class DeploymentManager extends ContainerLifeCycle
requestAppGoal(appentry, nodeName);
}
private void addOnStartupError(Throwable cause)
{
try (AutoLock l = _lock.lock())
{
if (onStartupErrors == null)
onStartupErrors = new MultiException();
onStartupErrors.add(cause);
}
}
/**
* Set a contextAttribute that will be set for every Context deployed by this provider.
*