Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert use of ExceptionUtil on caught exceptions (not useful) 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1907654 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2023-02-14 15:03:26 +00:00
parent f6cec39ba2
commit d07d8e42b9
48 changed files with 13 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
poi-examples/src/main/java/org/apache/poi/examples/hpsf/ReadCustomPropertySets.java
View File

@ -29,6 +29,7 @@ import org.apache.poi.hpsf.PropertySetFactory;
import org.apache.poi.hpsf.Section;
import org.apache.poi.poifs.eventfilesystem.POIFSReader;
import org.apache.poi.poifs.eventfilesystem.POIFSReaderEvent;
import org.apache.poi.util.ExceptionUtil;
/**
* <p>Sample application showing how to read a document's custom property set.
@ -66,6 +67,9 @@ public final class ReadCustomPropertySets {
out("No property set stream: \"" + streamName + "\"");
return;
} catch (Exception ex) {
if (ExceptionUtil.isFatal(ex)) {
ExceptionUtil.rethrow(ex);
}
throw new HPSFRuntimeException("Property set stream \"" + streamName + "\": " + ex);
}

7
poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntTask.java
View File

@ -24,7 +24,6 @@ import java.util.Locale;
import org.apache.poi.ss.excelant.util.ExcelAntWorkbookUtil;
import org.apache.poi.ss.excelant.util.ExcelAntWorkbookUtilFactory;
import org.apache.poi.util.ExceptionUtil;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
@ -105,9 +104,6 @@ public class ExcelAntTask extends Task {
try {
workbookUtil.addFunction(eaUdf.getFunctionAlias(), eaUdf.getClassName());
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
throw new BuildException(e.getMessage(), e);
}
}
@ -148,9 +144,6 @@ public class ExcelAntTask extends Task {
Class.forName("org.apache.poi.hssf.usermodel.HSSFWorkbook");
Class.forName("org.apache.poi.ss.usermodel.WorkbookFactory");
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
throw new BuildException(
"The <classpath> for <excelant> must include poi.jar and poi-ooxml.jar " +
"if not in Ant's own classpath. Processing .xlsx spreadsheets requires " +

4
poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/Chunk.java
View File

@ -22,7 +22,6 @@ import java.util.ArrayList;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.poi.hdgf.chunks.ChunkFactory.CommandDefinition;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.LittleEndian;
import static org.apache.logging.log4j.util.Unbox.box;
@ -246,9 +245,6 @@ public final class Chunk {
}
}
catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
LOG.atError().withThrowable(e).log("Unexpected error processing command, ignoring and continuing. Command: {}", command);
}

8
poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/ChunkStream.java
View File

@ -25,7 +25,6 @@ import org.apache.poi.hdgf.chunks.Chunk;
import org.apache.poi.hdgf.chunks.ChunkFactory;
import org.apache.poi.hdgf.chunks.ChunkHeader;
import org.apache.poi.hdgf.pointers.Pointer;
import org.apache.poi.util.ExceptionUtil;
import static org.apache.logging.log4j.util.Unbox.box;
@ -73,10 +72,9 @@ public final class ChunkStream extends Stream {
pos = contents.length;
}
}
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
}
catch (Exception e)
{
LOG.atError().withThrowable(e).log("Failed to create chunk at {}, ignoring rest of data.", box(pos));
}

4
poi-scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfGraphics.java
View File

@ -51,7 +51,6 @@ import org.apache.poi.hwmf.record.HwmfColorRef;
import org.apache.poi.hwmf.record.HwmfMisc;
import org.apache.poi.hwmf.record.HwmfObjectTableEntry;
import org.apache.poi.hwmf.record.HwmfPenStyle;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.Internal;
public class HemfGraphics extends HwmfGraphics {
@ -146,9 +145,6 @@ public class HemfGraphics extends HwmfGraphics {
try {
pathConsumer.accept(path);
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
// workaround if a path has been started and no MoveTo command
// has been specified before the first lineTo/splineTo
final Point2D loc = prop.getLocation();

6
poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusImage.java
View File

@ -45,7 +45,6 @@ import org.apache.poi.sl.draw.ImageRenderer;
import org.apache.poi.sl.usermodel.PictureData.PictureType;
import org.apache.poi.util.BitField;
import org.apache.poi.util.BitFieldFactory;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.GenericRecordJsonWriter;
import org.apache.poi.util.GenericRecordUtil;
import org.apache.poi.util.IOUtils;
@ -443,10 +442,7 @@ public class HemfPlusImage {
default:
break;
}
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
} catch (Exception ignored) {
}
return new Rectangle2D.Double(1,1,1,1);
}

4
poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java
View File

@ -35,7 +35,6 @@ import org.apache.poi.ddf.EscherContainerRecord;
import org.apache.poi.hslf.exceptions.HSLFException;
import org.apache.poi.hslf.usermodel.HSLFSlideShow;
import org.apache.poi.sl.image.ImageHeaderPICT;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.Internal;
import org.apache.poi.util.Removal;
@ -105,9 +104,6 @@ public final class PICT extends Metafile {
Arrays.fill(chunk, (byte) 0);
}
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
int lastLen = chunk.length - 1;
while (lastLen >= 0 && chunk[lastLen] == 0) {
lastLen--;

6
poi-scratchpad/src/main/java/org/apache/poi/hslf/record/MasterTextPropAtom.java
View File

@ -27,7 +27,6 @@ import java.util.Map;
import java.util.function.Supplier;
import org.apache.poi.hslf.model.textproperties.IndentProp;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.GenericRecordUtil;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.LittleEndian;
@ -98,10 +97,7 @@ public final class MasterTextPropAtom extends RecordAtom {
try {
read();
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
} catch (Exception e){
LOG.atError().withThrowable(e).log("Failed to parse MasterTextPropAtom");
}
}

6
poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TxMasterStyleAtom.java
View File

@ -32,7 +32,6 @@ import org.apache.poi.hslf.exceptions.HSLFException;
import org.apache.poi.hslf.model.textproperties.TextPropCollection;
import org.apache.poi.hslf.model.textproperties.TextPropCollection.TextPropType;
import org.apache.poi.sl.usermodel.TextShape.TextPlaceholder;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.GenericRecordUtil;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.LittleEndian;
@ -77,10 +76,7 @@ public final class TxMasterStyleAtom extends RecordAtom {
//read available styles
try {
init();
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
} catch (Exception e){
LOG.atWarn().withThrowable(e).log("Exception when reading available styles");
}
}

13
poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java
View File

@ -42,7 +42,6 @@ import org.apache.poi.poifs.crypt.Decryptor;
import org.apache.poi.poifs.crypt.EncryptionInfo;
import org.apache.poi.poifs.crypt.Encryptor;
import org.apache.poi.util.BitField;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.Internal;
import org.apache.poi.util.LittleEndian;
@ -171,9 +170,6 @@ public class HSLFSlideShowEncrypted implements Closeable {
}
cyos.initCipherForBlock(persistId, false);
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
throw new EncryptedPowerPointFileException(e);
}
return cyos;
@ -203,9 +199,6 @@ public class HSLFSlideShowEncrypted implements Closeable {
readFully(ccis, docstream, offset+8, rlen);
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
throw new EncryptedPowerPointFileException(e);
}
}
@ -290,9 +283,6 @@ public class HSLFSlideShowEncrypted implements Closeable {
int blipLen = endOffset - offset;
decryptPicBytes(pictstream, offset, blipLen);
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
throw new CorruptPowerPointFileException(e);
}
}
@ -372,9 +362,6 @@ public class HSLFSlideShowEncrypted implements Closeable {
ccos.write(pictstream, offset, blipLen);
ccos.flush();
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
throw new EncryptedPowerPointFileException(e);
} finally {
IOUtils.closeQuietly(ccos);

4
poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java
View File

@ -47,7 +47,6 @@ import org.apache.poi.hwmf.record.HwmfRecordType;
import org.apache.poi.hwmf.record.HwmfWindowing.WmfSetWindowExt;
import org.apache.poi.hwmf.record.HwmfWindowing.WmfSetWindowOrg;
import org.apache.poi.util.Dimension2DDouble;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.LittleEndianInputStream;
import org.apache.poi.util.LocaleUtil;
@ -107,9 +106,6 @@ public class HwmfPicture implements Iterable<HwmfRecord>, GenericRecord {
recordSize = (int)recordSizeLong;
recordFunction = leis.readShort();
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
LOG.atError().log("unexpected eof - wmf file was truncated");
break;
}

9
poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocument.java
View File

@ -71,7 +71,6 @@ import org.apache.poi.poifs.filesystem.DirectoryNode;
import org.apache.poi.poifs.filesystem.Entry;
import org.apache.poi.poifs.filesystem.EntryUtils;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.Internal;
import org.apache.poi.util.LittleEndianByteArrayOutputStream;
@ -299,9 +298,7 @@ public final class HWPFDocument extends HWPFDocumentCore {
try {
preserveBinTables = Boolean.parseBoolean(System.getProperty(PROPERTY_PRESERVE_BIN_TABLES));
} catch (Exception exc) {
if (ExceptionUtil.isFatal(exc)) {
ExceptionUtil.rethrow(exc);
}
// ignore;
}
if (!preserveBinTables) {
@ -317,9 +314,7 @@ public final class HWPFDocument extends HWPFDocumentCore {
try {
preserveTextTable = Boolean.parseBoolean(System.getProperty(PROPERTY_PRESERVE_TEXT_TABLE));
} catch (Exception exc) {
if (ExceptionUtil.isFatal(exc)) {
ExceptionUtil.rethrow(exc);
}
// ignore;
}
if (!preserveTextTable) {
_cft = new ComplexFileTable();

10
poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java
View File

@ -51,7 +51,6 @@ import org.apache.poi.hwpf.usermodel.TableCell;
import org.apache.poi.hwpf.usermodel.TableRow;
import org.apache.poi.poifs.filesystem.Entry;
import org.apache.poi.util.Beta;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.Internal;
import org.apache.poi.util.LocaleUtil;
import org.apache.poi.util.StringUtil;
@ -628,9 +627,6 @@ public abstract class AbstractWordConverter {
processDocumentInformation(summaryInformation);
}
} catch (Exception exc) {
if (ExceptionUtil.isFatal(exc)) {
ExceptionUtil.rethrow(exc);
}
LOG.atWarn().withThrowable(exc).log("Unable to process document summary information");
}
@ -896,9 +892,6 @@ public abstract class AbstractWordConverter {
try {
return processOle2(doc, block, entry);
} catch (Exception exc) {
if (ExceptionUtil.isFatal(exc)) {
ExceptionUtil.rethrow(exc);
}
LOG.atWarn().withThrowable(exc).log("Unable to convert internal OLE2 object '{}'", box(characterRun.getPicOffset()));
return false;
}
@ -954,9 +947,6 @@ public abstract class AbstractWordConverter {
processParagraph(wordDocument, flow, currentTableLevel, paragraph, label);
processed = true;
} catch (Exception exc) {
if (ExceptionUtil.isFatal(exc)) {
ExceptionUtil.rethrow(exc);
}
LOG.atWarn().withThrowable(exc).log("Can't process paragraph as list entry, will be processed without list information");
}
}

4
poi-scratchpad/src/main/java/org/apache/poi/hwpf/extractor/Word6Extractor.java
View File

@ -26,7 +26,6 @@ import org.apache.poi.hwpf.converter.WordToTextConverter;
import org.apache.poi.hwpf.usermodel.Range;
import org.apache.poi.poifs.filesystem.DirectoryNode;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.ExceptionUtil;
/**
* Class to extract the text from old (Word 6 / Word 95) Word Documents.
@ -91,9 +90,6 @@ public final class Word6Extractor implements POIOLE2TextExtractor {
ret = WordExtractor.getParagraphText(r);
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
// Something's up with turning the text pieces into paragraphs
// Fall back to ripping out the text pieces
ret = new String[doc.getTextTable().getTextPieces().size()];

4
poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java
View File

@ -35,7 +35,6 @@ import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.usermodel.CharacterRun;
import org.apache.poi.hwpf.usermodel.Picture;
import org.apache.poi.hwpf.usermodel.Range;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.Internal;
import org.apache.poi.util.LittleEndian;
@ -180,9 +179,6 @@ public final class PicturesTable {
pictures.add(new Picture(blip));
}
} catch (Exception exc) {
if (ExceptionUtil.isFatal(exc)) {
ExceptionUtil.rethrow(exc);
}
LOG.atWarn().withThrowable(exc).log("Unable to load picture from BLIP record at offset #{}", box(bse.getOffset()));
}
}

4
poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmBuffer.java
View File

@ -20,7 +20,6 @@ package org.apache.poi.hwpf.sprm;
import java.util.Arrays;
import org.apache.poi.common.Duplicatable;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.Internal;
import org.apache.poi.util.LittleEndian;
@ -209,9 +208,6 @@ public final class SprmBuffer implements Duplicatable {
try {
stringBuilder.append(iterator.next());
} catch (Exception exc) {
if (ExceptionUtil.isFatal(exc)) {
ExceptionUtil.rethrow(exc);
}
stringBuilder.append("error");
}
stringBuilder.append("; ");

4
poi/src/main/java/org/apache/poi/POIDocument.java
View File

@ -45,7 +45,6 @@ import org.apache.poi.poifs.crypt.cryptoapi.CryptoAPIEncryptor;
import org.apache.poi.poifs.filesystem.DirectoryNode;
import org.apache.poi.poifs.filesystem.DocumentInputStream;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.Internal;
@ -246,9 +245,6 @@ public abstract class POIDocument implements Closeable {
} catch (IOException e) {
throw e;
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
throw new IOException("Error "+step+" property set with name " + setName, e);
} finally {
IOUtils.closeQuietly(encPoifs);

7
poi/src/main/java/org/apache/poi/hpsf/Property.java
View File

@ -35,7 +35,6 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.poi.hpsf.wellknown.PropertyIDMap;
import org.apache.poi.util.CodePageUtil;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.HexDump;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.LittleEndianByteArrayInputStream;
@ -404,9 +403,6 @@ public class Property {
try {
write(bos, codepage);
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
LOG.atWarn().withThrowable(e).log("can't serialize string");
}
@ -479,9 +475,6 @@ public class Property {
return LocaleUtil.getLocaleFromLCID(((Number)value).intValue());
}
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
LOG.atWarn().log("Can't decode id {}", box(getID()));
}
return null;

4
poi/src/main/java/org/apache/poi/hpsf/Section.java
View File

@ -35,7 +35,6 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.poi.hpsf.wellknown.PropertyIDMap;
import org.apache.poi.util.CodePageUtil;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.LittleEndianByteArrayInputStream;
@ -548,9 +547,6 @@ public class Section {
} catch (HPSFRuntimeException ex) {
throw ex;
} catch (Exception ex) {
if (ExceptionUtil.isFatal(ex)) {
ExceptionUtil.rethrow(ex);
}
throw new HPSFRuntimeException(ex);
}
}

4
poi/src/main/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java
View File

@ -25,7 +25,6 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.poifs.crypt.ChunkedCipherInputStream;
import org.apache.poi.poifs.crypt.Decryptor;
import org.apache.poi.poifs.crypt.EncryptionInfo;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.Internal;
import org.apache.poi.util.LittleEndian;
@ -62,9 +61,6 @@ public final class Biff8DecryptingStream implements BiffHeaderInput, LittleEndia
ccis.readFully(initialBuf);
}
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
throw new RecordFormatException(e);
}
}

4
poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
View File

@ -105,7 +105,6 @@ import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.util.CellReference;
import org.apache.poi.ss.util.WorkbookUtil;
import org.apache.poi.util.Configurator;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.HexDump;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.Internal;
@ -1585,9 +1584,6 @@ public final class HSSFWorkbook extends POIDocument implements Workbook {
}
os.close();
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
throw new EncryptedDocumentException(e);
}
}

4
poi/src/main/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
View File

@ -34,7 +34,6 @@ import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.RC2ParameterSpec;
import org.apache.poi.EncryptedDocumentException;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.Internal;
import org.apache.poi.util.LittleEndian;
@ -347,9 +346,6 @@ public final class CryptoFunctions {
Class<Provider> clazz = (Class<Provider>)cl.loadClass(bcProviderName);
Security.addProvider(clazz.getDeclaredConstructor().newInstance());
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
throw new EncryptedDocumentException("Only the BouncyCastle provider supports your encryption settings - please add it to the classpath.", e);
}
}

7
poi/src/main/java/org/apache/poi/poifs/crypt/EncryptionInfo.java
View File

@ -35,7 +35,6 @@ import org.apache.poi.poifs.filesystem.DirectoryNode;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.BitField;
import org.apache.poi.util.BitFieldFactory;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.LittleEndianInput;
/**
@ -142,9 +141,6 @@ public class EncryptionInfo implements GenericRecord {
try {
eib = getBuilder(encryptionMode);
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
throw new IOException(e);
}
@ -191,9 +187,6 @@ public class EncryptionInfo implements GenericRecord {
try {
eib = getBuilder(encryptionMode);
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
throw new EncryptedDocumentException(e);
}

4
poi/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java
View File

@ -24,7 +24,6 @@ import org.apache.poi.poifs.crypt.ChainingMode;
import org.apache.poi.poifs.crypt.CipherAlgorithm;
import org.apache.poi.poifs.crypt.EncryptionHeader;
import org.apache.poi.poifs.crypt.HashAlgorithm;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.GenericRecordUtil;
public class AgileEncryptionHeader extends EncryptionHeader {
@ -49,9 +48,6 @@ public class AgileEncryptionHeader extends EncryptionHeader {
throw new NullPointerException("keyData not set");
}
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
throw new EncryptedDocumentException("Unable to parse keyData");
}

3
poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java
View File

@ -42,7 +42,6 @@ import org.apache.poi.poifs.filesystem.DocumentInputStream;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.BitField;
import org.apache.poi.util.BitFieldFactory;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.LittleEndianInputStream;
@ -213,8 +212,6 @@ public class CryptoAPIDecryptor extends Decryptor {
throw (GeneralSecurityException)e;
} else if (e instanceof IOException) {
throw (IOException)e;
} else if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
} else {
throw new IOException("summary entries can't be read", e);
}

7
poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentOutputStream.java
View File

@ -24,7 +24,6 @@ import javax.crypto.Cipher;
import org.apache.commons.io.input.BoundedInputStream;
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.poi.EncryptedDocumentException;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.Internal;
/**
@ -60,9 +59,6 @@ import org.apache.poi.util.Internal;
cipher.update(oneByte, 0, 1, oneByte, 0);
super.write(oneByte);
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
throw new EncryptedDocumentException(e);
}
}
@ -73,9 +69,6 @@ import org.apache.poi.util.Internal;
cipher.update(b, off, len, b, off);
super.write(b, off, len);
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
throw new EncryptedDocumentException(e);
}
}

6
poi/src/main/java/org/apache/poi/sl/draw/DrawPictureShape.java
View File

@ -35,7 +35,6 @@ import org.apache.poi.poifs.filesystem.FileMagic;
import org.apache.poi.sl.usermodel.PictureData;
import org.apache.poi.sl.usermodel.PictureShape;
import org.apache.poi.sl.usermodel.RectAlign;
import org.apache.poi.util.ExceptionUtil;
public class DrawPictureShape extends DrawSimpleShape {
@ -104,10 +103,7 @@ public class DrawPictureShape extends DrawSimpleShape {
}
} catch (NoSuchElementException ignored) {
break;
} catch (Exception | ServiceConfigurationError e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
} catch (Exception | ServiceConfigurationError ignored) {
}
}

4
poi/src/main/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java
View File

@ -47,7 +47,6 @@ import org.apache.poi.ss.usermodel.ShapeContainer;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.util.Beta;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.LocaleUtil;
@ -133,9 +132,6 @@ public class EmbeddedExtractor implements Iterable<EmbeddedExtractor> {
data = new EmbeddedData(od.getFileName(), od.getObjectData(), od.getContentType());
}
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
LOG.atWarn().withThrowable(e).log("Entry not found / readable - ignoring OLE embedding");
}
} else if (shape instanceof Picture) {

7
poi/src/main/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java
View File

@ -51,7 +51,6 @@ import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.ss.util.CellReference;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.LocaleUtil;
import org.apache.poi.util.StringUtil;
@ -510,9 +509,6 @@ public class EvaluationConditionalFormatRule implements Comparable<EvaluationCon
// see TextFunction.TRIM for implementation
return StringUtil.isBlank(v);
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
// not a valid string value, and not a blank cell (that's checked earlier)
return false;
}
@ -522,9 +518,6 @@ public class EvaluationConditionalFormatRule implements Comparable<EvaluationCon
// see TextFunction.TRIM for implementation
return StringUtil.isNotBlank(v);
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
// not a valid string value, but not blank
return true;
}

7
poi/src/main/java/org/apache/poi/ss/formula/OperationEvaluationContext.java
View File

@ -42,7 +42,6 @@ import org.apache.poi.ss.formula.ptg.Ref3DPtg;
import org.apache.poi.ss.formula.ptg.Ref3DPxg;
import org.apache.poi.ss.util.CellReference;
import org.apache.poi.ss.util.CellReference.NameType;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.LocaleUtil;
/**
@ -258,9 +257,6 @@ public final class OperationEvaluationContext {
}
return new LazyAreaEval(0, absoluteC, ssVersion.getLastRowIndex(), absoluteC, sre);
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
return ErrorEval.REF_INVALID;
}
}
@ -283,9 +279,6 @@ public final class OperationEvaluationContext {
}
return new LazyAreaEval(absoluteR, 0, absoluteR, ssVersion.getLastColumnIndex(), sre);
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
return ErrorEval.REF_INVALID;
}
}

10
poi/src/main/java/org/apache/poi/ss/formula/SheetNameFormatter.java
View File

@ -23,7 +23,6 @@ import java.util.regex.Pattern;
import org.apache.poi.ss.util.CellReference;
import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.util.ExceptionUtil;
/**
* Formats sheet names for use in formula expressions.
@ -69,9 +68,6 @@ public final class SheetNameFormatter {
appendAndEscape(out, rawSheetName);
}
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
throw new IllegalStateException(e);
}
}
@ -100,9 +96,6 @@ public final class SheetNameFormatter {
appendOrREF(out, rawSheetName);
}
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
throw new IllegalStateException(e);
}
}
@ -132,9 +125,6 @@ public final class SheetNameFormatter {
sb.append(ch);
}
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
throw new IllegalStateException(e);
}
}

4
poi/src/main/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
View File

@ -40,7 +40,6 @@ import org.apache.poi.ss.formula.udf.UDFFinder;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.util.CellRangeAddressBase;
import org.apache.poi.ss.util.CellReference;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.Internal;
import static org.apache.logging.log4j.util.Unbox.box;
@ -333,9 +332,6 @@ public final class WorkbookEvaluator {
String msg = "Error evaluating cell " + cr.formatAsString();
return new NotImplementedException(msg, inner);
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
// avoid bombing out during exception handling
LOG.atError().withThrowable(e).log("Can't add exception info");
return inner; // preserve original exception

4
poi/src/main/java/org/apache/poi/ss/formula/atp/Switch.java
View File

@ -24,7 +24,6 @@ import org.apache.poi.ss.formula.eval.EvaluationException;
import org.apache.poi.ss.formula.eval.OperandResolver;
import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.ss.formula.functions.FreeRefFunction;
import org.apache.poi.util.ExceptionUtil;
import static org.apache.poi.ss.formula.eval.RelationalOperationEval.EqualEval;
@ -54,9 +53,6 @@ public final class Switch implements FreeRefFunction {
try {
expression = OperandResolver.getSingleValue(args[0], ec.getRowIndex(), ec.getColumnIndex());
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
return ErrorEval.NA;
}

7
poi/src/main/java/org/apache/poi/ss/formula/atp/XLookupFunction.java
View File

@ -23,7 +23,6 @@ import org.apache.poi.ss.formula.eval.*;
import org.apache.poi.ss.formula.functions.ArrayFunction;
import org.apache.poi.ss.formula.functions.FreeRefFunction;
import org.apache.poi.ss.formula.functions.LookupUtils;
import org.apache.poi.util.ExceptionUtil;
/**
* Implementation of Excel function XLOOKUP()
@ -82,9 +81,6 @@ final class XLookupFunction implements FreeRefFunction, ArrayFunction {
} catch (EvaluationException e) {
return e.getErrorEval();
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
return ErrorEval.VALUE_INVALID;
}
}
@ -97,9 +93,6 @@ final class XLookupFunction implements FreeRefFunction, ArrayFunction {
} catch (EvaluationException e) {
return e.getErrorEval();
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
return ErrorEval.VALUE_INVALID;
}
}

7
poi/src/main/java/org/apache/poi/ss/formula/atp/XMatchFunction.java
View File

@ -22,7 +22,6 @@ import org.apache.poi.ss.formula.TwoDEval;
import org.apache.poi.ss.formula.eval.*;
import org.apache.poi.ss.formula.functions.FreeRefFunction;
import org.apache.poi.ss.formula.functions.LookupUtils;
import org.apache.poi.util.ExceptionUtil;
/**
* Implementation of Excel function XMATCH()
@ -65,9 +64,6 @@ final class XMatchFunction implements FreeRefFunction {
} catch (EvaluationException e) {
return e.getErrorEval();
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
return ErrorEval.VALUE_INVALID;
}
}
@ -80,9 +76,6 @@ final class XMatchFunction implements FreeRefFunction {
} catch (EvaluationException e) {
return e.getErrorEval();
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
return ErrorEval.VALUE_INVALID;
}
}

4
poi/src/main/java/org/apache/poi/ss/formula/functions/Areas.java
View File

@ -22,7 +22,6 @@ import org.apache.poi.ss.formula.eval.NumberEval;
import org.apache.poi.ss.formula.eval.RefListEval;
import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.ss.formula.ptg.NumberPtg;
import org.apache.poi.util.ExceptionUtil;
/**
* Returns the number of areas in a reference. An area is a range of contiguous cells or a single cell.
@ -43,9 +42,6 @@ public final class Areas implements Function {
}
return new NumberEval(new NumberPtg(result));
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
return ErrorEval.VALUE_INVALID;
}

4
poi/src/main/java/org/apache/poi/ss/formula/functions/Correl.java
View File

@ -21,7 +21,6 @@ import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.EvaluationException;
import org.apache.poi.ss.formula.eval.NumberEval;
import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.util.ExceptionUtil;
import java.util.List;
@ -58,9 +57,6 @@ public class Correl extends Fixed2ArgFunction {
} catch (EvaluationException e) {
return e.getErrorEval();
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
return ErrorEval.NA;
}
}

4
poi/src/main/java/org/apache/poi/ss/formula/functions/Covar.java
View File

@ -22,7 +22,6 @@ import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.EvaluationException;
import org.apache.poi.ss.formula.eval.NumberEval;
import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.util.ExceptionUtil;
import java.util.List;
@ -58,9 +57,6 @@ public class Covar extends Fixed2ArgFunction implements FreeRefFunction {
} catch (EvaluationException e) {
return e.getErrorEval();
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
return ErrorEval.NA;
}
}

4
poi/src/main/java/org/apache/poi/ss/formula/functions/DStarRunner.java
View File

@ -32,7 +32,6 @@ import org.apache.poi.ss.formula.eval.StringEval;
import org.apache.poi.ss.formula.eval.StringValueEval;
import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.ss.util.NumberComparer;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.Internal;
import org.apache.poi.util.LocaleUtil;
@ -137,9 +136,6 @@ public final class DStarRunner implements Function3Arg {
return e.getErrorEval();
}
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
if (!algorithm.allowEmptyMatchField()) {
return ErrorEval.VALUE_INVALID;
}

4
poi/src/main/java/org/apache/poi/ss/formula/functions/Days.java
View File

@ -28,7 +28,6 @@ import org.apache.poi.ss.formula.eval.OperandResolver;
import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.ss.usermodel.DateUtil;
import org.apache.poi.ss.util.DateParser;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.LocaleUtil;
/**
@ -83,9 +82,6 @@ public class Days implements FreeRefFunction {
double d0 = NumericFunction.singleOperandEvaluate(ve, srcRowIndex, srcColumnIndex);
return getDate(d0);
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
String strText1 = OperandResolver.coerceValueToString(ve);
return DateParser.parseLocalDate(strText1);
}

4
poi/src/main/java/org/apache/poi/ss/formula/functions/Forecast.java
View File

@ -22,7 +22,6 @@ import org.apache.poi.ss.formula.eval.EvaluationException;
import org.apache.poi.ss.formula.eval.NumberEval;
import org.apache.poi.ss.formula.eval.OperandResolver;
import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.util.ExceptionUtil;
import java.util.List;
@ -74,9 +73,6 @@ public class Forecast extends Fixed3ArgFunction implements FreeRefFunction {
} catch (EvaluationException e) {
return e.getErrorEval();
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
return ErrorEval.NA;
}
}

4
poi/src/main/java/org/apache/poi/ss/formula/functions/Indirect.java
View File

@ -31,7 +31,6 @@ import org.apache.poi.ss.formula.eval.OperandResolver;
import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.ss.formula.ptg.Area3DPxg;
import org.apache.poi.ss.usermodel.Table;
import org.apache.poi.util.ExceptionUtil;
/**
* Implementation for Excel function INDIRECT<p>
@ -143,9 +142,6 @@ public final class Indirect implements FreeRefFunction {
try {
return ec.getDynamicReference(workbookName, sheetName, refStrPart1, refStrPart2, isA1style);
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
LOGGER.atWarn().log("Indirect function: failed to parse reference {}", text, e);
return ErrorEval.REF_INVALID;
}

4
poi/src/main/java/org/apache/poi/ss/formula/functions/NumberValueFunction.java
View File

@ -25,7 +25,6 @@ import org.apache.poi.ss.formula.eval.NumberEval;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.EvaluationException;
import org.apache.poi.ss.formula.eval.OperandResolver;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.LocaleUtil;
/**
@ -112,9 +111,6 @@ public final class NumberValueFunction implements FreeRefFunction {
} catch (EvaluationException e) {
return e.getErrorEval();
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
return ErrorEval.VALUE_INVALID; //If any of the arguments are not valid, NUMBERVALUE returns the #VALUE! error value.
}

7
poi/src/main/java/org/apache/poi/ss/formula/functions/TimeValue.java
View File

@ -22,7 +22,6 @@ import org.apache.logging.log4j.Logger;
import org.apache.poi.ss.formula.eval.*;
import org.apache.poi.ss.usermodel.DateUtil;
import org.apache.poi.ss.util.DateParser;
import org.apache.poi.util.ExceptionUtil;
import java.time.DateTimeException;
import java.time.LocalDate;
@ -61,17 +60,11 @@ public class TimeValue extends Fixed1ArgFunction {
try {
return parseTimeFromDateTime(dateTimeText);
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
try {
//this could be a time (with no date part) - prepend a dummy date because
//parseTimeFromDateTime needs it
return parseTimeFromDateTime("1/01/2000 " + dateTimeText);
} catch (Exception e2) {
if (ExceptionUtil.isFatal(e2)) {
ExceptionUtil.rethrow(e2);
}
LocalDate ld = DateParser.parseLocalDate(dateTimeText);
//return 0 as this is a pure date with no time element
return new NumberEval(0);

4
poi/src/main/java/org/apache/poi/ss/formula/functions/WeekNum.java
View File

@ -33,7 +33,6 @@ import org.apache.poi.ss.formula.eval.NumberEval;
import org.apache.poi.ss.formula.eval.OperandResolver;
import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.ss.usermodel.DateUtil;
import org.apache.poi.util.ExceptionUtil;
/**
* Implementation for Excel WeekNum() function.
@ -70,9 +69,6 @@ public class WeekNum extends Fixed2ArgFunction implements FreeRefFunction {
.atZone(ZoneId.systemDefault())
.toLocalDate();
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
return ErrorEval.NUM_ERROR;
}
int returnType;

7
poi/src/main/java/org/apache/poi/ss/usermodel/DataFormatter.java
View File

@ -47,7 +47,6 @@ import org.apache.poi.ss.format.CellFormatResult;
import org.apache.poi.ss.formula.ConditionalFormattingEvaluator;
import org.apache.poi.ss.util.DateFormatConverter;
import org.apache.poi.ss.util.NumberToTextConverter;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.LocaleUtil;
import org.apache.poi.util.StringUtil;
@ -408,9 +407,6 @@ public class DataFormatter {
// Wrap and return (non-cacheable - CellFormat does that)
return new CellFormatResultWrapper( cfmt.apply(cellValueO) );
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
LOG.atWarn().withThrowable(e).log("Formatting failed for format {}, falling back", formatStr);
}
}
@ -1123,9 +1119,6 @@ public class DataFormatter {
try {
cellType = cell.getCachedFormulaResultType();
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
return cell.getCellFormula();
}
} else {

4
poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java
View File

@ -38,7 +38,6 @@ import org.apache.poi.ss.usermodel.RichTextString;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.util.ExceptionUtil;
import org.apache.poi.util.Internal;
@ -193,9 +192,6 @@ public class SheetUtil {
try {
sval = formatter.formatCellValue(cell, dummyEvaluator);
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
sval = String.valueOf(cell.getNumericCellValue());
}
} else if (cellType == CellType.BOOLEAN) {

3
poi/src/main/java/org/apache/poi/util/Configurator.java
View File

@ -34,9 +34,6 @@ public class Configurator {
try {
return Integer.parseInt(property);
} catch (Exception e) {
if (ExceptionUtil.isFatal(e)) {
ExceptionUtil.rethrow(e);
}
LOG.atError().log("System property -D{} does not contains a valid integer: {}", systemProperty, property);
return defaultValue;
}