diff options
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigUtil.java | 2 | ||||
| -rw-r--r-- | gerrit-server/src/test/java/com/google/gerrit/server/config/ConfigUtilTest.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigUtil.java index 6068c503f7..cc5405487b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigUtil.java @@ -228,7 +228,7 @@ public class ConfigUtil { */ public static long getTimeUnit(final String valueString, long defaultValue, TimeUnit wantUnit) { - Matcher m = Pattern.compile("^([1-9][0-9]*)\\s*(.*)$").matcher(valueString); + Matcher m = Pattern.compile("^(0|[1-9][0-9]*)\\s*(.*)$").matcher(valueString); if (!m.matches()) { return defaultValue; } diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/config/ConfigUtilTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/config/ConfigUtilTest.java index 37197ec9bb..5d7291630d 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/config/ConfigUtilTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/config/ConfigUtilTest.java @@ -26,9 +26,11 @@ import java.util.concurrent.TimeUnit; public class ConfigUtilTest extends TestCase { public void testTimeUnit() { + assertEquals(ms(0, MILLISECONDS), parse("0")); assertEquals(ms(2, MILLISECONDS), parse("2ms")); assertEquals(ms(200, MILLISECONDS), parse("200 milliseconds")); + assertEquals(ms(0, SECONDS), parse("0s")); assertEquals(ms(2, SECONDS), parse("2s")); assertEquals(ms(231, SECONDS), parse("231sec")); assertEquals(ms(1, SECONDS), parse("1second")); |