Tweak NPOIFS constructors so that if you have a FileChannel, you can pass it in, but that the File based one will tidy up after itself in the event of errors
poi/trunk/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java