Skip to content

Commit ee0a4c4

Browse files
committed
Check for blank fieldkey parts
1 parent e2c6dc7 commit ee0a4c4

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

src/org/labkey/test/params/FieldKey.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ public static FieldKey fromParts(List<String> parts)
5050

5151
for (String part : parts)
5252
{
53-
if (StringUtils.isBlank(part))
54-
throw new IllegalArgumentException("FieldKey contains a blank part: " + parts);
5553
fieldKey = fieldKey.child(part);
5654
}
5755

@@ -115,15 +113,18 @@ public FieldKey getParent()
115113
return _parent;
116114
}
117115

118-
public FieldKey child(String name)
116+
public FieldKey child(String part)
119117
{
118+
if (StringUtils.isBlank(part))
119+
throw new IllegalArgumentException("FieldKey can't have blank part(s): " + this);
120+
120121
if (StringUtils.isBlank(getName()))
121122
{
122-
return new FieldKey(name);
123+
return new FieldKey(part);
123124
}
124125
else
125126
{
126-
return new FieldKey(this, name);
127+
return new FieldKey(this, part);
127128
}
128129
}
129130

0 commit comments

Comments
 (0)