From 42734675f4825e4856f67945981ce44d2190dbd6 Mon Sep 17 00:00:00 2001 From: Vojtech Juranek Date: Fri, 8 Mar 2013 14:04:25 +0100 Subject: [PATCH] [FIXED JENKINS-17128] Unquote labels before processing --- core/src/main/java/jenkins/model/Jenkins.java | 1 + .../test/java/hudson/model/labels/LabelExpressionTest.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java index 8ba08f4cae..1c0b3e339d 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 4239b75ba7..60c85d80a8 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()); } /** -- GitLab