[richfaces-svn-commits] JBoss Rich Faces SVN: r16298 - in branches/enterprise/3.3.X/framework/impl/src: test/java/org/ajax4jsf/io/parser and 1 other directory.
Author: konstantin.mishin
Date: 2010-01-14 13:14:34 -0500 (Thu, 14 Jan 2010)
New Revision: 16298
Modified:
branches/enterprise/3.3.X/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoParser.java
branches/enterprise/3.3.X/framework/impl/src/test/java/org/ajax4jsf/io/parser/FastParserTest.java
Log:
RFPL-237
porting RF-7344 to enterprise branch
Modified:
branches/enterprise/3.3.X/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoParser.java
===================================================================
---
branches/enterprise/3.3.X/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoParser.java 2010-01-14
16:50:06 UTC (rev 16297)
+++
branches/enterprise/3.3.X/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoParser.java 2010-01-14
18:14:34 UTC (rev 16298)
@@ -507,7 +507,7 @@
if (haveHead) {
// <title> or <base> in the head
if (!("title".equalsIgnoreCase(name.rawname) || "base"
- .equalsIgnoreCase(element.rawname) || "meta"
+ .equalsIgnoreCase(name.rawname) || "meta"
.equalsIgnoreCase(name.rawname))) {
insertResources(name.prefix, name.uri);
}
Modified:
branches/enterprise/3.3.X/framework/impl/src/test/java/org/ajax4jsf/io/parser/FastParserTest.java
===================================================================
---
branches/enterprise/3.3.X/framework/impl/src/test/java/org/ajax4jsf/io/parser/FastParserTest.java 2010-01-14
16:50:06 UTC (rev 16297)
+++
branches/enterprise/3.3.X/framework/impl/src/test/java/org/ajax4jsf/io/parser/FastParserTest.java 2010-01-14
18:14:34 UTC (rev 16298)
@@ -118,8 +118,8 @@
assertTrue(resultString.indexOf("<title>")<resultString.lastIndexOf("<link"));
assertTrue(resultString.indexOf("</head>")>resultString.lastIndexOf("</script"));
assertTrue(resultString.indexOf("</head>")>resultString.lastIndexOf("<link"));
- assertTrue(resultString.indexOf("<meta")>resultString.lastIndexOf("</script"));
- assertTrue(resultString.indexOf("<meta")>resultString.lastIndexOf("<link"));
+ assertTrue(resultString.indexOf("<meta")<resultString.lastIndexOf("</script"));
+ assertTrue(resultString.indexOf("<meta")<resultString.lastIndexOf("<link"));
}
/**