Author: tallison
Date: Tue Apr 14 10:57:30 2015
New Revision: 1673406
URL: http://svn.apache.org/r1673406
Log:
TIKA-1605
Modified:
tika/trunk/tika-core/src/main/java/org/apache/tika/parser/RecursiveParserWrapper.java
tika/trunk/tika-core/src/test/java/org/apache/tika/io/FilenameUtilsTest.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaServerParseExceptionMapper.java
Modified:
tika/trunk/tika-core/src/main/java/org/apache/tika/parser/RecursiveParserWrapper.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/RecursiveParserWrapper.java?rev=1673406&r1=1673405&r2=1673406&view=diff
==============================================================================
---
tika/trunk/tika-core/src/main/java/org/apache/tika/parser/RecursiveParserWrapper.java
(original)
+++
tika/trunk/tika-core/src/main/java/org/apache/tika/parser/RecursiveParserWrapper.java
Tue Apr 14 10:57:30 2015
@@ -190,7 +190,8 @@ public class RecursiveParserWrapper impl
* @return
*/
private boolean isWriteLimitReached(Throwable t) {
- if (t.getMessage().indexOf("Your document contained more than") == 0) {
+ if (t.getMessage() != null &&
+ t.getMessage().indexOf("Your document contained more than") ==
0) {
return true;
} else {
return t.getCause() != null && isWriteLimitReached(t.getCause());
Modified:
tika/trunk/tika-core/src/test/java/org/apache/tika/io/FilenameUtilsTest.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-core/src/test/java/org/apache/tika/io/FilenameUtilsTest.java?rev=1673406&r1=1673405&r2=1673406&view=diff
==============================================================================
---
tika/trunk/tika-core/src/test/java/org/apache/tika/io/FilenameUtilsTest.java
(original)
+++
tika/trunk/tika-core/src/test/java/org/apache/tika/io/FilenameUtilsTest.java
Tue Apr 14 10:57:30 2015
@@ -49,8 +49,8 @@ public class FilenameUtilsTest {
FilenameUtils.normalize(null);
fail("missing check for null parameters");
} catch (IllegalArgumentException x) {
- assertTrue(x.getMessage().contains("name"));
- assertTrue(x.getMessage().contains("not be null"));
+ assertTrue(x.getMessage() != null &&
x.getMessage().contains("name"));
+ assertTrue(x.getMessage() != null && x.getMessage().contains("not
be null"));
}
}
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java?rev=1673406&r1=1673405&r2=1673406&view=diff
==============================================================================
---
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java
(original)
+++
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java
Tue Apr 14 10:57:30 2015
@@ -111,7 +111,9 @@ public class ImageParser extends Abstrac
} catch (IIOException e) {
// TIKA-619: There is a known bug in the Sun API when dealing
with GIF images
// which Tika will just ignore.
- if (!(e.getMessage().equals("Unexpected block type 0!") &&
type.equals("image/gif"))) {
+ if (!(e.getMessage() != null &&
+ e.getMessage().equals("Unexpected block type 0!") &&
+ type.equals("image/gif"))) {
throw new TikaException(type + " parse error", e);
}
}
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java?rev=1673406&r1=1673405&r2=1673406&view=diff
==============================================================================
---
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java
(original)
+++
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java
Tue Apr 14 10:57:30 2015
@@ -111,7 +111,8 @@ public class OOXMLExtractorFactory {
// Extract the text, along with any in-document metadata
extractor.getXHTML(baseHandler, metadata, context);
} catch (IllegalArgumentException e) {
- if (e.getMessage().startsWith("No supported documents found")) {
+ if (e.getMessage() != null &&
+ e.getMessage().startsWith("No supported documents found"))
{
throw new TikaException(
"TIKA-418: RuntimeException while getting content"
+ " for thmx and xps file types", e);
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java?rev=1673406&r1=1673405&r2=1673406&view=diff
==============================================================================
---
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
(original)
+++
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
Tue Apr 14 10:57:30 2015
@@ -155,7 +155,8 @@ public class PDFParser extends AbstractP
} catch (IOException e) {
//nonseq parser throws IOException for bad password
//At the Tika level, we want the same exception to be thrown
- if (e.getMessage().contains("Error (CryptographyException)")) {
+ if (e.getMessage() != null &&
+ e.getMessage().contains("Error (CryptographyException)")) {
metadata.set("pdf:encrypted", Boolean.toString(true));
throw new EncryptedDocumentException(e);
}
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaServerParseExceptionMapper.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaServerParseExceptionMapper.java?rev=1673406&r1=1673405&r2=1673406&view=diff
==============================================================================
---
tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaServerParseExceptionMapper.java
(original)
+++
tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaServerParseExceptionMapper.java
Tue Apr 14 10:57:30 2015
@@ -41,7 +41,8 @@ public class TikaServerParseExceptionMap
}
public Response toResponse(TikaServerParseException e) {
- if
(e.getMessage().equals(Response.Status.UNSUPPORTED_MEDIA_TYPE.toString())) {
+ if (e.getMessage() != null &&
+
e.getMessage().equals(Response.Status.UNSUPPORTED_MEDIA_TYPE.toString())) {
return buildResponse(e, 415);
}
Throwable cause = e.getCause();
