You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ju...@apache.org on 2010/05/12 16:37:22 UTC
svn commit: r943518 -
/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/XHTMLDowngradeHandler.java
Author: jukka
Date: Wed May 12 14:37:22 2010
New Revision: 943518
URL: http://svn.apache.org/viewvc?rev=943518&view=rev
Log:
TIKA-415: Findbugs: XHTMLDowngradeHandler equals() comparing different types
Fix the broken comparison. Also made the toUpperCase calls use the English locale to avoid i18n issues.
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/XHTMLDowngradeHandler.java
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/XHTMLDowngradeHandler.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/XHTMLDowngradeHandler.java?rev=943518&r1=943517&r2=943518&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/XHTMLDowngradeHandler.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/XHTMLDowngradeHandler.java Wed May 12 14:37:22 2010
@@ -16,6 +16,8 @@
*/
package org.apache.tika.parser.html;
+import java.util.Locale;
+
import javax.xml.XMLConstants;
import org.apache.tika.sax.ContentHandlerDecorator;
@@ -41,18 +43,18 @@ class XHTMLDowngradeHandler extends Cont
public void startElement(
String uri, String localName, String name, Attributes atts)
throws SAXException {
- String upper = localName.toUpperCase();
+ String upper = localName.toUpperCase(Locale.ENGLISH);
AttributesImpl attributes = new AttributesImpl();
for (int i = 0; i < atts.getLength(); i++) {
+ String auri = atts.getURI(i);
String local = atts.getLocalName(i);
String qname = atts.getQName(i);
- if (!XMLConstants.NULL_NS_URI.equals(atts.getURI(i).length())
+ if (XMLConstants.NULL_NS_URI.equals(auri)
&& !local.equals(XMLConstants.XMLNS_ATTRIBUTE)
&& !qname.startsWith(XMLConstants.XMLNS_ATTRIBUTE + ":")) {
attributes.addAttribute(
- atts.getURI(i), local, qname,
- atts.getType(i), atts.getValue(i));
+ auri, local, qname, atts.getType(i), atts.getValue(i));
}
}
@@ -62,7 +64,7 @@ class XHTMLDowngradeHandler extends Cont
@Override
public void endElement(String uri, String localName, String name)
throws SAXException {
- String upper = localName.toUpperCase();
+ String upper = localName.toUpperCase(Locale.ENGLISH);
super.endElement(XMLConstants.NULL_NS_URI, upper, upper);
}