svn commit: r1138748 - in /wicket/trunk/wicket-core/src: main/java/org/apache/wicket/markup/parser/XmlPullParser.java test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java

[jdonnerstag]

Author: jdonnerstag
Date: Thu Jun 23 07:10:41 2011
New Revision: 1138748

URL: http://svn.apache.org/viewvc?rev=1138748&view=rev
Log:
fixed bug related to conditional-comment-endif 

Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java
    
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java?rev=1138748&r1=1138747&r2=1138748&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java
 Thu Jun 23 07:10:41 2011
@@ -357,7 +357,7 @@ public final class XmlPullParser impleme
                // and also <!--<![endif]-->"
                if (tagText.equals("![endif]--"))
                {
-                       lastType = HttpTagType.CONDITIONAL_COMMENT;
+                       lastType = HttpTagType.CONDITIONAL_COMMENT_ENDIF;
                        input.setPosition(closeBracketIndex + 1);
                        return;
                }

Modified: 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java?rev=1138748&r1=1138747&r2=1138748&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java
 (original)
+++ 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java
 Thu Jun 23 07:10:41 2011
@@ -359,7 +359,7 @@ public class XmlPullParserTest extends T
                assertEquals("a", (parser.getElement()).getName());
                assertTrue((parser.getElement()).isClose());
                type = parser.next();
-               assertEquals(type, HttpTagType.CONDITIONAL_COMMENT);
+               assertEquals(type, HttpTagType.CONDITIONAL_COMMENT_ENDIF);
                type = parser.next();
                assertEquals(type, HttpTagType.NOT_INITIALIZED);
        }