svn commit: r498919 - /incubator/wicket/branches/wicket-1.2.x/wicket/src/main/java/wicket/markup/MarkupParser.java

[ivaynberg]

Author: ivaynberg
Date: Mon Jan 22 20:49:45 2007
New Revision: 498919

URL: http://svn.apache.org/viewvc?view=rev&rev=498919
Log:
WICKET-218: improved comments in markup handling

Modified:
    
incubator/wicket/branches/wicket-1.2.x/wicket/src/main/java/wicket/markup/MarkupParser.java

Modified: 
incubator/wicket/branches/wicket-1.2.x/wicket/src/main/java/wicket/markup/MarkupParser.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.2.x/wicket/src/main/java/wicket/markup/MarkupParser.java?view=diff&rev=498919&r1=498918&r2=498919
==============================================================================
--- 
incubator/wicket/branches/wicket-1.2.x/wicket/src/main/java/wicket/markup/MarkupParser.java
 (original)
+++ 
incubator/wicket/branches/wicket-1.2.x/wicket/src/main/java/wicket/markup/MarkupParser.java
 Mon Jan 22 20:49:45 2007
@@ -388,11 +388,13 @@
                                if 
(CONDITIONAL_COMMENT.matcher(comment).matches() == false)
                                {
                                        buf.append(rawMarkup.substring(0, pos1 
- 1));
-                                       buf.append(rawMarkup.substring(pos2 + 
4));
+                                       if (rawMarkup.length() >= pos2 + 4) {
+                                               
buf.append(rawMarkup.substring(pos2 + 4));
+                                       }
                                        rawMarkup = buf.toString();
                                }
                        }
-                       pos1 = rawMarkup.indexOf("<!--", pos1 + 4);
+                       pos1 = rawMarkup.length() <= pos1 + 2 ? -1 : 
rawMarkup.indexOf("<!--", pos1 + 4);
                }
                return rawMarkup;
        }