[Fix JENKINS-13896] End marker must come after start marker.

jenkinsci · May 29, 2012 · c03fa8b · c03fa8b
1 parent 4a5a4b5
commit c03fa8b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 
     <artifactId>confluence-publisher</artifactId>
     <name>Confluence Publisher</name>
-    <description>Publish build argifacts to an Atlassian Confluence wiki</description>
+    <description>Publish build artifacts to an Atlassian Confluence wiki</description>
     <version>1.6-SNAPSHOT</version>
     <packaging>hpi</packaging>
     <url>http://wiki.jenkins-ci.org/display/JENKINS/Confluence+Publisher+Plugin</url>

diff --git a/src/main/java/com/myyearbook/hudson/plugins/confluence/wiki/editors/BetweenTokensEditor.java b/src/main/java/com/myyearbook/hudson/plugins/confluence/wiki/editors/BetweenTokensEditor.java
@@ -42,15 +42,18 @@ public String performEdits(final BuildListener listener, final String content,
         final StringBuffer sb = new StringBuffer(content);
 
         final int start = content.indexOf(startMarkerToken) + startMarkerToken.length();
-        final int end = content.indexOf(endMarkerToken);
 
         if (start < 0) {
             throw new TokenNotFoundException(
                     "Start-marker token could not be found in the page content: "
                             + startMarkerToken);
-        } else if (end < 0) {
+        }
+
+        final int end = content.indexOf(endMarkerToken, start);
+
+        if (end < 0) {
             throw new TokenNotFoundException(
-                    "End-marker token could not be found in the page content: " + endMarkerToken);
+                    "End-marker token could not be found after the start-marker token: " + endMarkerToken);
         }
 
         // Remove the entire marked section (exclusive)