Author: nick
Date: Tue Jan 24 14:48:58 2012
New Revision: 1235284

URL: http://svn.apache.org/viewvc?rev=1235284&view=rev
Log:
TIKA-760 Avoid NPE in XHTMLContentHandler if a null string is passed to the 
characters method

Modified:
    
tika/trunk/tika-core/src/main/java/org/apache/tika/sax/XHTMLContentHandler.java

Modified: 
tika/trunk/tika-core/src/main/java/org/apache/tika/sax/XHTMLContentHandler.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/sax/XHTMLContentHandler.java?rev=1235284&r1=1235283&r2=1235284&view=diff
==============================================================================
--- 
tika/trunk/tika-core/src/main/java/org/apache/tika/sax/XHTMLContentHandler.java 
(original)
+++ 
tika/trunk/tika-core/src/main/java/org/apache/tika/sax/XHTMLContentHandler.java 
Tue Jan 24 14:48:58 2012
@@ -291,7 +291,9 @@ public class XHTMLContentHandler extends
     }
 
     public void characters(String characters) throws SAXException {
-        characters(characters.toCharArray(), 0, characters.length());
+        if (characters != null && characters.length() > 0) {
+            characters(characters.toCharArray(), 0, characters.length());
+        }
     }
 
     public void newline() throws SAXException {


Reply via email to