opendev/gerrit
Code Issues Proposed changes

Use Prolog term none if a min or max is missing

Browse Source 
Labels can be missing a min or max value if there are no values
defined, or if all of the values are less then or equal to 0.

Instead of crashing in PRED_get_legacy_label_types_1 return 'none'.

Change-Id: Ie90df66ee4bea4d50befd1b3cb78af9a7456579f
This commit is contained in:
Shawn Pearce
2013-08-13 09:26:43 -07:00
parent 77dfd854cf
commit 20dfc507dd
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-server/src/main/java/gerrit/PRED_get_legacy_label_types_1.java
View File

@@ -15,6 +15,7 @@
package gerrit;
import com.google.gerrit.common.data.LabelType;
import com.google.gerrit.common.data.LabelValue;
import com.google.gerrit.rules.PrologEnvironment;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.project.ProjectState;
@@ -43,6 +44,8 @@ import java.util.List;
* </ul>
*/
class PRED_get_legacy_label_types_1 extends Predicate.P1 {
private static final SymbolTerm NONE = SymbolTerm.intern("none");
PRED_get_legacy_label_types_1(Term a1, Operation n) {
arg1 = a1;
cont = n;
@@ -75,10 +78,12 @@ class PRED_get_legacy_label_types_1 extends Predicate.P1 {
"label_type", 4);
static Term export(LabelType type) {
LabelValue min = type.getMin();
LabelValue max = type.getMax();
return new StructureTerm(symLabelType,
SymbolTerm.intern(type.getName()),
SymbolTerm.intern(type.getFunctionName()),
new IntegerTerm(type.getMin().getValue()),
new IntegerTerm(type.getMax().getValue()));
min != null ? new IntegerTerm(min.getValue()) : NONE,
max != null ? new IntegerTerm(max.getValue()) : NONE);
}
}