Bug 289960 - start.jar assumes command line args are configs

* Fixing xml configuration defaulting logic.
  Only default xml based on lack of xml definition on both the
  command line and not being present in the start.config

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/branches/jetty-7.0.0.x@953 7e9141cc-0065-0410-87d8-b60c137991c4

1 files changed, 5 insertions, 7 deletions

diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
index 03c6d6611c..8b5557f9c1 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
@@ -434,11 +434,12 @@ public class Main
         // Setup Start / Stop Monitoring
         startMonitor();
 
+        // Initialize the Config (start.config)
+        initConfig(xmls);
+
         // Default XMLs (if not specified)
         if (xmls.isEmpty())
         {
-            // Do not rely on _jettyHome yet, as initConfig(xmls) defines _jettyHome, and
-            // resolveXmlConfigs(xmls) normalizes the xmls based off it.
             if (_fromDaemon)
             {
                 xmls.add("etc/jetty-logging.xml");
@@ -446,9 +447,6 @@ public class Main
             xmls.add("etc/jetty.xml");
         }
 
-        // Initialize the Config (start.config)
-        initConfig(xmls);
-
         // Add mandatory options for secure mode
         if (_secure)
         {
@@ -563,14 +561,14 @@ public class Main
                     int len=in.read(buf);
                     while(len>0)
                     {
-                        out.write(buf,0,len); 
+                        out.write(buf,0,len);
                         len=in.read(buf);
                     }
                 }
                 catch(IOException e)
                 {
                     e.printStackTrace();
-                }   
+                }
             }
             
         }).start();