From 4680bd516de970241fc316a809125fd3ac274314 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 19 Mar 2021 21:26:30 +0000 Subject: [PATCH] try to re-enable new getBlockAt code git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1887828 13f79535-47bb-0310-9956-ffa450edef68 --- src/integrationtest/org/apache/poi/stress/TestAllFiles.java | 1 + src/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/integrationtest/org/apache/poi/stress/TestAllFiles.java b/src/integrationtest/org/apache/poi/stress/TestAllFiles.java index 55777d12ee..4e913e5775 100644 --- a/src/integrationtest/org/apache/poi/stress/TestAllFiles.java +++ b/src/integrationtest/org/apache/poi/stress/TestAllFiles.java @@ -86,6 +86,7 @@ public class TestAllFiles { DirectoryScanner scanner = new DirectoryScanner(); scanner.setBasedir(ROOT_DIR); scanner.setExcludes(SCAN_EXCLUDES); + scanner.setIncludes(new String[]{"**/unknown_properties.msg"}); scanner.scan(); diff --git a/src/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java b/src/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java index 9df110ed2d..db49e5b814 100644 --- a/src/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java +++ b/src/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java @@ -61,12 +61,12 @@ public class POIFSMiniStore extends BlockStore { int bigBlockOffset = byteOffset % _filesystem.getBigBlockSize(); // Now locate the data block for it - Iterator it = _mini_stream.getBlockIterator(); + Iterator it = _mini_stream.getBlockOffsetIterator(); for (int i = 0; i < bigBlockNumber; i++) { it.next(); } - ByteBuffer dataBlock = it.next(); + ByteBuffer dataBlock = _filesystem.getBlockAt(it.next()); assert(dataBlock != null); // Position ourselves, and take a slice