Просмотр исходного кода

use try with resources

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1818786 13f79535-47bb-0310-9956-ffa450edef68
tags/REL_4_0_0_FINAL
PJ Fanning 6 лет назад
Родитель
Сommit
808ec42570
1 измененных файлов: 15 добавлений и 13 удалений
  1. 15
    13
      src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java

+ 15
- 13
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java Просмотреть файл

@@ -617,10 +617,11 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook {
}
try {
ByteArrayOutputStream out = new ByteArrayOutputStream();
try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
srcSheet.write(out);
clonedSheet.read(new ByteArrayInputStream(out.toByteArray()));
try (ByteArrayInputStream bis = new ByteArrayInputStream(out.toByteArray())) {
clonedSheet.read(bis);
}
} catch (IOException e){
throw new POIXMLException("Failed to clone sheet", e);
}
@@ -2366,18 +2367,19 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook {
Ole10Native ole10 = new Ole10Native(label, fileName, command, oleData);

ByteArrayOutputStream bos = new ByteArrayOutputStream(oleData.length+500);
ole10.writeOut(bos);
try (POIFSFileSystem poifs = new POIFSFileSystem()) {
DirectoryNode root = poifs.getRoot();
root.createDocument(Ole10Native.OLE10_NATIVE, new ByteArrayInputStream(bos.toByteArray()));
root.setStorageClsid(ClassID.OLE10_PACKAGE);
try (ByteArrayOutputStream bos = new ByteArrayOutputStream(oleData.length+500)) {
ole10.writeOut(bos);

// TODO: generate CombObj stream
try (POIFSFileSystem poifs = new POIFSFileSystem()) {
DirectoryNode root = poifs.getRoot();
root.createDocument(Ole10Native.OLE10_NATIVE, new ByteArrayInputStream(bos.toByteArray()));
root.setStorageClsid(ClassID.OLE10_PACKAGE);

try (OutputStream os = pp.getOutputStream()) {
poifs.writeFilesystem(os);
// TODO: generate CombObj stream

try (OutputStream os = pp.getOutputStream()) {
poifs.writeFilesystem(os);
}
}
}


Загрузка…
Отмена
Сохранить