Skip to content

Commit a4927a6

Browse files
committed
[RELEASE] iText 7 RUPS - 7.1.16
https://github.com/itext/i7j-rups/releases/tag/7.1.16 * release_branch_DEVSIX-5154: [RELEASE] RUPS 7.1.16 Add PdfDocument/PdfReader constructors to try-with-resources Add TODO with a ticket for refactoring XML processing logic [AFTER RELEASE] RUPS 7.1.15
2 parents d5981d7 + 0736730 commit a4927a6

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.itextpdf</groupId>
77
<artifactId>root</artifactId>
8-
<version>7.1.15</version>
8+
<version>7.1.16</version>
99
<relativePath />
1010
</parent>
1111

src/main/java/com/itextpdf/rups/controller/RupsController.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,8 @@ public CompareTool.CompareResult compareWithDocument(PdfDocument document) {
433433
}
434434

435435
public CompareTool.CompareResult compareWithFile(File file) {
436-
try (PdfDocument cmpDocument = new PdfDocument(new PdfReader(file.getAbsolutePath()))) {
436+
try (PdfReader readerPdf = new PdfReader(file.getAbsolutePath());
437+
PdfDocument cmpDocument = new PdfDocument(readerPdf)) {
437438
return compareWithDocument(cmpDocument);
438439
} catch (IOException e) {
439440
LoggerHelper.warn(LoggerMessages.CREATE_COMPARE_DOC_ERROR, e, getClass());
@@ -442,19 +443,13 @@ public CompareTool.CompareResult compareWithFile(File file) {
442443
}
443444

444445
public CompareTool.CompareResult compareWithStream(InputStream is) {
445-
PdfDocument cmpDocument = null;
446-
try {
447-
PdfReader reader = new PdfReader(is);
446+
try (PdfReader reader = new PdfReader(is);
447+
PdfDocument cmpDocument = new PdfDocument(reader)) {
448448
reader.setCloseStream(false);
449-
cmpDocument = new PdfDocument(reader);
450449
return compareWithDocument(cmpDocument);
451450
} catch (IOException e) {
452451
LoggerHelper.warn(LoggerMessages.CREATE_COMPARE_DOC_ERROR, e, getClass());
453452
return null;
454-
} finally {
455-
if (cmpDocument != null) {
456-
cmpDocument.close();
457-
}
458453
}
459454
}
460455

src/main/java/com/itextpdf/rups/model/XfaFile.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ public XfaFile(OutputStreamResource resource) throws IOException, DocumentExcept
7878
ByteArrayOutputStream baos = new ByteArrayOutputStream();
7979
resource.writeTo(baos);
8080
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
81+
// TODO DEVSIX-5299 refactor logic to use XML processing from com.itextpdf.kernel.utils.XmlUtils
8182
SAXReader reader = new SAXReader();
8283
reader.setEntityResolver(new SafeEmptyEntityResolver());
8384
xfaDocument = reader.read(bais);

0 commit comments

Comments
 (0)