Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2014-10-09 19:42:14 +0000
committerJoakim Erdfelt2014-10-09 19:42:14 +0000
commit67db9e67def541886496481b90d527c570e0e0fd (patch)
treea6c9e3098553675d9422962a75714f52cc7d8502 /jetty-start
parent7635b3cd493849685b87004c390d8b66fc6150cd (diff)
parent060a26ecfe391bb1e16b5033e7f06419249b3f7f (diff)
downloadorg.eclipse.jetty.project-67db9e67def541886496481b90d527c570e0e0fd.tar.gz
org.eclipse.jetty.project-67db9e67def541886496481b90d527c570e0e0fd.tar.xz
org.eclipse.jetty.project-67db9e67def541886496481b90d527c570e0e0fd.zip
Merge branch 'jetty-9.2.x' into cdi-testing
Diffstat (limited to 'jetty-start')
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/Main.java2
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 a31fbb06ab..f755f19f41 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
@@ -811,7 +811,7 @@ public class Main
if (args.getProperties().getString("STOP.WAIT") != null)
{
- int stopWait = Integer.parseInt(args.getProperties().getString("STOP.PORT"));
+ int stopWait = Integer.parseInt(args.getProperties().getString("STOP.WAIT"));
stop(stopPort,stopKey,stopWait);
}

Back to the top