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

Fixing bug with active option additions with --secure. 

* The --secure added options were being set BEFORE the config was read.
  It should be set after the Config is read, so that any defaults
  and commandline OPTIONS are kept.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@701 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Joakim Erdfelt 2009-08-11 20:35:03 +00:00
parent 9f70dc338a
commit 8890819c16
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -459,13 +459,6 @@ public class Main
// Setup Start / Stop Monitoring
startMonitor();
// Add mandatory options for secure mode
if (_secure)
{
_config.addActiveOption("secure");
_config.addActiveOption("security");
}
// Default XMLs (if not specified)
if (xmls.isEmpty())
{
@ -481,6 +474,13 @@ public class Main
// Initialize the Config (start.config)
initConfig(xmls);
// Add mandatory options for secure mode
if (_secure)
{
_config.addActiveOption("secure");
_config.addActiveOption("security");
}
// Normalize the XML config options passed on the command line.
xmls = resolveXmlConfigs(xmls);