diff --git a/scm-core/src/main/java/sonia/scm/io/RegexResourceProcessor.java b/scm-core/src/main/java/sonia/scm/io/RegexResourceProcessor.java index e3882de6fe..4bed4974fe 100644 --- a/scm-core/src/main/java/sonia/scm/io/RegexResourceProcessor.java +++ b/scm-core/src/main/java/sonia/scm/io/RegexResourceProcessor.java @@ -127,8 +127,12 @@ public class RegexResourceProcessor extends AbstractResourceProcessor } } - return (result != null) - ? result.toString() - : line; + if (result != null) + { + m.appendTail(result); + line = result.toString(); + } + + return line; } } diff --git a/scm-core/src/test/java/sonia/scm/io/ResourceProcessorTestBase.java b/scm-core/src/test/java/sonia/scm/io/ResourceProcessorTestBase.java index 340708800a..ba139a5cff 100644 --- a/scm-core/src/test/java/sonia/scm/io/ResourceProcessorTestBase.java +++ b/scm-core/src/test/java/sonia/scm/io/ResourceProcessorTestBase.java @@ -53,13 +53,16 @@ public abstract class ResourceProcessorTestBase { /** Field description */ - public static final String TEXT_1 = "Hello Tricia McMillan"; + public static final String TEXT_1 = "Hello Tricia McMillan!"; /** Field description */ - public static final String TEXT_2 = "Hello ${person}"; + public static final String TEXT_2 = "Hello ${person}!"; /** Field description */ - public static final String TEXT_3 = "Hello ${person} and ${secondPerson}"; + public static final String TEXT_3 = "Hello ${person} and ${secondPerson}!"; + + /** Field description */ + public static final String TEXT_4 = "