From d684fe1ebe6af95fcc53feb409bcd05e8f5fb121 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 27 Jan 2020 18:29:43 +0000 Subject: [PATCH] fix NPE in test code git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1873225 13f79535-47bb-0310-9956-ffa450edef68 --- src/integrationtest/org/apache/poi/BaseIntegrationTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/integrationtest/org/apache/poi/BaseIntegrationTest.java b/src/integrationtest/org/apache/poi/BaseIntegrationTest.java index c1a49fda58..7f60dbb74b 100644 --- a/src/integrationtest/org/apache/poi/BaseIntegrationTest.java +++ b/src/integrationtest/org/apache/poi/BaseIntegrationTest.java @@ -75,12 +75,13 @@ public class BaseIntegrationTest { throw e; } catch (IOException e) { // ignore some other ways of corrupted files - if(e.getMessage().contains("Truncated ZIP file")) { + String message = e.getMessage(); + if(message != null && message.contains("Truncated ZIP file")) { Assume.assumeFalse("File " + file + " excluded because the Zip file is incomplete", true); } // sometimes binary format has XML-format-extension... - if(e.getMessage().contains("rong file format or file extension for OO XML file")) { + if(message != null && message.contains("rong file format or file extension for OO XML file")) { handleWrongOLE2XMLExtension(inputFile, e); return; } -- 2.39.5