diff --git a/differences/dometahierarchy.groovy b/differences/dometahierarchy.groovy index 46a2943..67b08f3 100644 --- a/differences/dometahierarchy.groovy +++ b/differences/dometahierarchy.groovy @@ -172,8 +172,7 @@ def extractmerges(String line) { def extractjiraticketinfo(String line) { def List jiratickets = [] - boolean amatch = false - while (!amatch) { + while (true) { line = line.trim() def pattern1 = '^(\\w+-\\d+)(.*)' //GIS-1234 hmbxr5601-1234 def match1 = (line =~ pattern1) @@ -181,7 +180,6 @@ def extractjiraticketinfo(String line) { jiraticket = match1.group(1) jiratickets.add(jiraticket) line = match1.group(2) - amatch = true } else { def pattern2 = '^(\\w+\\d+)(.*)' //GIS1234 smb1234 def match2 = (line =~ pattern2) @@ -189,7 +187,6 @@ def extractjiraticketinfo(String line) { jiraticket = match2.group(1) jiratickets.add(jiraticket) line = match2.group(2) - amatch = true } else { def pattern3 = '^(\\w+ \\d+)(.*)' //GIS 1234 smb 1234 def match3 = (line =~ pattern3) @@ -197,8 +194,9 @@ def extractjiraticketinfo(String line) { jiraticket = match3.group(1) jiratickets.add(jiraticket) line = match3.group(2) - amatch = true } + } else { + break } } }