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

Fixes #1163

This commit is contained in:
Greg Wilkins 2016-12-12 19:55:29 +11:00
parent 4f48d7aadf
commit dd50c9fa24
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
View File

@ -109,7 +109,7 @@ public class Main
}
private BaseHome baseHome;
private StartArgs startupArgs;
private StartArgs jsvcStartArgs;
public Main() throws IOException
{
@ -486,7 +486,7 @@ public class Main
catch (Throwable e)
{
e.printStackTrace();
usageExit(e,ERR_INVOKE_MAIN,startupArgs.isTestingModeEnabled());
usageExit(e,ERR_INVOKE_MAIN,args.isTestingModeEnabled());
}
}
@ -573,11 +573,11 @@ public class Main
}
catch (ConnectException e)
{
usageExit(e,ERR_NOT_STOPPED,startupArgs.isTestingModeEnabled());
usageExit(e,ERR_NOT_STOPPED,jsvcStartArgs.isTestingModeEnabled());
}
catch (Exception e)
{
usageExit(e,ERR_UNKNOWN,startupArgs.isTestingModeEnabled());
usageExit(e,ERR_UNKNOWN,jsvcStartArgs.isTestingModeEnabled());
}
}
@ -630,29 +630,35 @@ public class Main
{
try
{
startupArgs = processCommandLine(args);
jsvcStartArgs = processCommandLine(args);
}
catch (UsageException e)
{
StartLog.error(e.getMessage());
usageExit(e.getCause(),e.getExitCode(),startupArgs.isTestingModeEnabled());
usageExit(e.getCause(),e.getExitCode(),false);
}
catch (Throwable e)
{
usageExit(e,UsageException.ERR_UNKNOWN,startupArgs.isTestingModeEnabled());
usageExit(e,UsageException.ERR_UNKNOWN,false);
}
}
// ------------------------------------------------------------
// implement Apache commons daemon (jsvc) lifecycle methods (init, start, stop, destroy)
public void start() throws Exception
{
start(startupArgs);
start(jsvcStartArgs);
}
// ------------------------------------------------------------
// implement Apache commons daemon (jsvc) lifecycle methods (init, start, stop, destroy)
public void stop() throws Exception
{
doStop(startupArgs);
doStop(jsvcStartArgs);
}
// ------------------------------------------------------------
// implement Apache commons daemon (jsvc) lifecycle methods (init, start, stop, destroy)
public void destroy()
{
}