diff options
| author | Jan Bartel | 2012-03-30 01:05:46 +0000 |
|---|---|---|
| committer | Jan Bartel | 2012-03-30 01:05:46 +0000 |
| commit | 17269583fbd6e3ef8041a544818384d04c088219 (patch) | |
| tree | 31a26ed9b4287f3e84ca05483123d442b366899f /jetty-start | |
| parent | 0f9a898c1c563ede10a5c2cf05bcb27ec3795658 (diff) | |
| parent | ec5f424c8c190c412ca122850b914f89e53148e9 (diff) | |
| download | org.eclipse.jetty.project-17269583fbd6e3ef8041a544818384d04c088219.tar.gz org.eclipse.jetty.project-17269583fbd6e3ef8041a544818384d04c088219.tar.xz org.eclipse.jetty.project-17269583fbd6e3ef8041a544818384d04c088219.zip | |
Merge remote-tracking branch 'origin/master' into jetty-8
Diffstat (limited to 'jetty-start')
| -rw-r--r-- | jetty-start/src/main/java/org/eclipse/jetty/start/Main.java | 2 |
1 files changed, 1 insertions, 1 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 d625814ba2..70fbe1063f 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 @@ -381,7 +381,7 @@ public class Main } else if (info.equals("@STARTINI")) { - List<String> ini = loadStartIni(null); + List<String> ini = loadStartIni(new File(_jettyHome,"start.ini")); if (ini != null && ini.size() > 0) { for (String a : ini) |