インプット・アウトプットのエラーキャッチ修正

diff --git a/Jaxcel/src/org/hanei/jaxcel/report/ReportMaker.java b/Jaxcel/src/org/hanei/jaxcel/report/ReportMaker.java
index dc99e44..a529f81 100644 (file)
--- a/Jaxcel/src/org/hanei/jaxcel/report/ReportMaker.java
+++ b/Jaxcel/src/org/hanei/jaxcel/report/ReportMaker.java
@@ -28,7 +28,6 @@ import java.util.Map;
 \r
 import org.apache.poi.hssf.usermodel.HSSFSheet;\r
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;\r
 \r
 import org.apache.poi.hssf.usermodel.HSSFSheet;\r
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;\r

-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;\r

 import org.apache.poi.openxml4j.opc.OPCPackage;\r
 import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;\r
 import org.apache.poi.poifs.filesystem.OfficeXmlFileException;\r
 import org.apache.poi.openxml4j.opc.OPCPackage;\r
 import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;\r
 import org.apache.poi.poifs.filesystem.OfficeXmlFileException;\r


@@ -480,7 +479,7 @@ public class ReportMaker {
                                        pkg = OPCPackage.open((InputStream) template);\r
                                }\r
                                book = WorkbookFactory.create(pkg);\r
                                        pkg = OPCPackage.open((InputStream) template);\r
                                }\r
                                book = WorkbookFactory.create(pkg);\r

-                       } catch (InvalidFormatException | IOException e2) {\r
+                       } catch (Exception e2) {\r

                                log.error("template file open error: {}. {}", e1.getMessage(), e2.getMessage());\r
                        }\r
                }\r
                                log.error("template file open error: {}. {}", e1.getMessage(), e2.getMessage());\r
                        }\r
                }\r


@@ -509,7 +508,7 @@ public class ReportMaker {
 \r
                try {\r
                        book.write(output);\r
 \r
                try {\r
                        book.write(output);\r

-               } catch (IOException e) {\r
+               } catch (Exception e) {\r

                        log.error("workbook output error: {}", e.getMessage(), e);\r
                        throw new JaxcelOutputException("workbook output error");\r
                }\r
                        log.error("workbook output error: {}", e.getMessage(), e);\r
                        throw new JaxcelOutputException("workbook output error");\r
                }\r