diff options
| author | Saša Živkov <zivkov@gmail.com> | 2015-06-10 12:26:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-06-10 12:26:35 +0000 |
| commit | e5e318c0c436851f8bc9a6cf1ce3cb338edcc470 (patch) | |
| tree | 32a5d394dc483932677bc8bcc5dd8d581e0196cc | |
| parent | 6b870dece5671a64bf57dab9ae9feeb72dad2787 (diff) | |
| parent | 6e6c5cd072879e5ddad553f54f453b5e5049b456 (diff) | |
Merge "Fixed regression caused by the defaultValue feature" into stable-2.10
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java index a905385772..351394249c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java @@ -684,13 +684,15 @@ public class ProjectConfig extends VersionedMetaData { label.setFunctionName(null); } - short dv = (short) rc.getInt(LABEL, name, KEY_DEFAULT_VALUE, 0); - if (isInRange(dv, values)) { - label.setDefaultValue(dv); - } else { - error(new ValidationError(PROJECT_CONFIG, String.format( - "Invalid %s \"%s\" for label \"%s\"", - KEY_DEFAULT_VALUE, dv, name))); + if (!values.isEmpty()) { + short dv = (short) rc.getInt(LABEL, name, KEY_DEFAULT_VALUE, 0); + if (isInRange(dv, values)) { + label.setDefaultValue(dv); + } else { + error(new ValidationError(PROJECT_CONFIG, String.format( + "Invalid %s \"%s\" for label \"%s\"", + KEY_DEFAULT_VALUE, dv, name))); + } } label.setCopyMinScore( rc.getBoolean(LABEL, name, KEY_COPY_MIN_SCORE, false)); |