From a52925efcc6b881dc8d24f0689851bf902c913ee Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 26 Mar 2014 11:34:08 -0700 Subject: [PATCH] 431279 - jetty-start / Unable to start jetty if no properties are defined. + Removed spurious check for no properties set (as System Properties are not part of that check, but should have been, which essentially means that there is never no properties available) --- .../src/main/java/org/eclipse/jetty/start/Props.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Props.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Props.java index 838cf4644c9..69c71c7a0b4 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/Props.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Props.java @@ -96,13 +96,6 @@ public final class Props implements Iterable return str; } - if (props.isEmpty()) - { - // nothing to expand - // this situation can occur from --add-to-startd on a new blank base directory - return str; - } - Pattern pat = Pattern.compile("(?<=[^$]|^)(\\$\\{[^}]*\\})"); Matcher mat = pat.matcher(str); StringBuilder expanded = new StringBuilder();