Author: fanningpj
Date: Fri Mar 19 21:26:30 2021
New Revision: 1887828
URL: http://svn.apache.org/viewvc?rev=1887828&view=rev
Log:
try to re-enable new getBlockAt code
Modified:
poi/trunk/src/integrationtest/org/apache/poi/stress/TestAllFiles.java
poi/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java
Modified: poi/trunk/src/integrationtest/org/apache/poi/stress/TestAllFiles.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/integrationtest/org/apache/poi/stress/TestAllFiles.java?rev=1887828&r1=1887827&r2=1887828&view=diff
==============================================================================
--- poi/trunk/src/integrationtest/org/apache/poi/stress/TestAllFiles.java
(original)
+++ poi/trunk/src/integrationtest/org/apache/poi/stress/TestAllFiles.java Fri
Mar 19 21:26:30 2021
@@ -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();
Modified: poi/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java?rev=1887828&r1=1887827&r2=1887828&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java
(original)
+++ poi/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java Fri
Mar 19 21:26:30 2021
@@ -61,12 +61,12 @@ public class POIFSMiniStore extends Bloc
int bigBlockOffset = byteOffset % _filesystem.getBigBlockSize();
// Now locate the data block for it
- Iterator<ByteBuffer> it = _mini_stream.getBlockIterator();
+ Iterator<Integer> 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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
