diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java index 31e6c5f3337f9a7f2be203660fdd588125d364a8..8528206628982dc967251dd5f54733becdb7d6a1 100755 --- a/core/src/main/java/jenkins/model/Jenkins.java +++ b/core/src/main/java/jenkins/model/Jenkins.java @@ -1570,6 +1570,7 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro */ public Label getLabel(String expr) { if(expr==null) return null; + expr = hudson.util.QuotedStringTokenizer.unquote(expr); while(true) { Label l = labels.get(expr); if(l!=null) diff --git a/test/src/test/java/hudson/model/labels/LabelExpressionTest.java b/test/src/test/java/hudson/model/labels/LabelExpressionTest.java index 4239b75ba7d23ce311a0bd5a4d7a1c12c3d4dc2b..60c85d80a84a3fc4a45c2c464a8f2f7c1a0be588 100644 --- a/test/src/test/java/hudson/model/labels/LabelExpressionTest.java +++ b/test/src/test/java/hudson/model/labels/LabelExpressionTest.java @@ -196,6 +196,10 @@ public class LabelExpressionTest extends HudsonTestCase { public void testQuote() { Label l = jenkins.getLabel("\"abc\\\\\\\"def\""); assertEquals("abc\\\"def",l.getName()); + + l = jenkins.getLabel("label1||label2"); // create label expression + l = jenkins.getLabel("\"label1||label2\""); + assertEquals("label1||label2",l.getName()); } /**