git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1854191 13f79535-47bb-0310-9956-ffa450edef68tags/REL_4_1_0
@@ -418,8 +418,8 @@ public abstract class POIDocument implements Closeable { | |||
@Override | |||
public void close() throws IOException { | |||
if (directory != null) { | |||
if (directory.getNFileSystem() != null) { | |||
directory.getNFileSystem().close(); | |||
if (directory.getFileSystem() != null) { | |||
directory.getFileSystem().close(); | |||
clearDirectory(); | |||
} | |||
} |
@@ -119,17 +119,6 @@ public class DirectoryNode | |||
return _nfilesystem; | |||
} | |||
/** | |||
* If this is NPOIFS based, return the NPOIFSFileSystem | |||
* that this belong to, otherwise Null if OPOIFS based | |||
* @return the filesystem that this belongs to | |||
*/ | |||
public POIFSFileSystem getNFileSystem() | |||
{ | |||
return _nfilesystem; | |||
} | |||
/** | |||
* open a document in the directory's entry's list of entries | |||
* |
@@ -87,7 +87,7 @@ public final class DocumentInputStream extends InputStream implements LittleEndi | |||
DocumentProperty property = (DocumentProperty)doc.getProperty(); | |||
_document = new POIFSDocument( | |||
property, | |||
((DirectoryNode)doc.getParent()).getNFileSystem() | |||
((DirectoryNode)doc.getParent()).getFileSystem() | |||
); | |||
_data = _document.getBlockIterator(); | |||
} |
@@ -54,7 +54,7 @@ public final class POIFSDocument implements POIFSViewable, Iterable<ByteBuffer> | |||
*/ | |||
public POIFSDocument(DocumentNode document) { | |||
this((DocumentProperty)document.getProperty(), | |||
((DirectoryNode)document.getParent()).getNFileSystem()); | |||
((DirectoryNode)document.getParent()).getFileSystem()); | |||
} | |||
/** |
@@ -442,7 +442,6 @@ public final class TestDocumentInputStream { | |||
try (POIFSFileSystem npoifs = new POIFSFileSystem(sample)) { | |||
// Ensure we have what we expect on the root | |||
assertEquals(npoifs, npoifs.getRoot().getNFileSystem()); | |||
assertEquals(npoifs, npoifs.getRoot().getFileSystem()); | |||
// Check inside |
@@ -140,9 +140,9 @@ public final class TestFileSystemBugs { | |||
// Copy over | |||
EntryUtils.copyNodes(root, dest); | |||
// Re-load, always as NPOIFS | |||
// Re-load | |||
ByteArrayOutputStream baos = new ByteArrayOutputStream(); | |||
root.getNFileSystem().writeFilesystem(baos); | |||
root.getFileSystem().writeFilesystem(baos); | |||
POIFSFileSystem read = new POIFSFileSystem( | |||
new ByteArrayInputStream(baos.toByteArray())); |