branch develop updated (7ad84cd2 -> ede2c535)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 7ad84cd2 Update .gitlab-ci.yml new ede2c535 - refs #10098 : Ferme quelques ressources non fermées The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ede2c5352f9f501cd05dd4255b039d82e373a207 Author: jcouteau <couteau@codelutin.com> Date: Wed Sep 26 10:44:40 2018 +0200 - refs #10098 : Ferme quelques ressources non fermées Summary of changes: .../faxtomail/services/service/ClientServiceImpl.java | 6 ++++++ .../faxtomail/services/service/EmailServiceImpl.java | 11 +++++++++-- .../ui/swing/content/pdfeditor/PDFEditorUIHandler.java | 2 +- .../franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java | 2 ++ 4 files changed, 18 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit ede2c5352f9f501cd05dd4255b039d82e373a207 Author: jcouteau <couteau@codelutin.com> Date: Wed Sep 26 10:44:40 2018 +0200 - refs #10098 : Ferme quelques ressources non fermées --- .../faxtomail/services/service/ClientServiceImpl.java | 6 ++++++ .../faxtomail/services/service/EmailServiceImpl.java | 11 +++++++++-- .../ui/swing/content/pdfeditor/PDFEditorUIHandler.java | 2 +- .../franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java | 2 ++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java index 6a24ed5a..67f145b0 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java @@ -308,10 +308,16 @@ public class ClientServiceImpl extends FaxToMailServiceSupport implements Client importedCount++; } + + //close resultSet when finished + resultSet.close(); // delete all rows stat = connection.createStatement(); stat.execute("DELETE FROM " + NewClient.class.getSimpleName()); + + //close statement when finished + stat.close(); // usefull log info (do not remove) if (importedCount > 0 && log.isInfoEnabled()) { diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java index 7624792e..933fc964 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java @@ -1511,14 +1511,21 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe importedCount++; } - + + //close resultSet when finished + resultSet.close(); + + // delete all rows stat = connection.createStatement(); stat.execute("DELETE FROM " + EdiReturn.class.getSimpleName() + " WHERE " + EdiReturn.PROPERTY_RANGE_ROW_TOPIA_ID + " IN ('" + StringUtils.join(rangeRowTopiaIdsInEdiReturnToDelete, "','") + "')"); + + //close statement when finished + stat.close(); - // usefull log info (do not remove) + // useful log info (do not remove) if (importedCount > 0 && log.isInfoEnabled()) { log.info(String.format("Imported %d ediReturn rows", importedCount)); } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java index 174f2afd..169859e0 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java @@ -536,7 +536,7 @@ public class PDFEditorUIHandler extends AbstractFaxToMailUIHandler<PDFEditorUIMo try (PDDocument pdDocument = PDDocument.load(file)) { PDFRenderer renderer = new PDFRenderer(pdDocument); return renderer.renderImage(pageNumber - 1, zoom); - } catch (IOException eee) { + } catch (Throwable eee) { //catch also JavaHeapSpace log.debug("Error getting page " + pageNumber, eee); getContext().getErrorHelper().showErrorDialog(t("faxtomail.pdfEditor.readPdf.error")); return null; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java index 33e33f19..dbe67349 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java @@ -825,6 +825,8 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { document.close(); writer.close(); + IOUtils.closeQuietly(inputStream); + return target; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm