From 5994292dbb4eef2760d10eaec16f43eb91c711c2 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 29 May 2024 15:07:59 +0200 Subject: [PATCH] IDEMPIERE-6160 Remove Eclipse warnings (#2379) --- .../src/org/compiere/impexp/OFXBankStatementHandler.java | 8 ++++++-- .../org/compiere/impexp/OFXFileBankStatementLoader.java | 8 ++++++++ .../src/org/compiere/install/ConfigurationData.java | 7 +++++++ org.adempiere.ui/src/org/compiere/apps/form/PayPrint.java | 5 +++-- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/impexp/OFXBankStatementHandler.java b/org.adempiere.base/src/org/compiere/impexp/OFXBankStatementHandler.java index 0b8fd4a8f9..fa0c096fbd 100644 --- a/org.adempiere.base/src/org/compiere/impexp/OFXBankStatementHandler.java +++ b/org.adempiere.base/src/org/compiere/impexp/OFXBankStatementHandler.java @@ -245,7 +245,8 @@ public abstract class OFXBankStatementHandler extends DefaultHandler if (isOfx1) { - m_reader = new BufferedReader(new InputStreamReader(new OFX1ToXML(reader))); + OFX1ToXML in = new OFX1ToXML(reader); + m_reader = new BufferedReader(new InputStreamReader(in)); } else { @@ -257,9 +258,12 @@ public abstract class OFXBankStatementHandler extends DefaultHandler { m_errorMessage = new StringBuffer("ErrorReadingData"); m_errorDescription = new StringBuffer(e.getMessage()); - closeBufferedReader(); return result; } + finally + { + closeBufferedReader(); + } return result; } // attachInput diff --git a/org.adempiere.base/src/org/compiere/impexp/OFXFileBankStatementLoader.java b/org.adempiere.base/src/org/compiere/impexp/OFXFileBankStatementLoader.java index dc86eeb1f4..7b3daed703 100644 --- a/org.adempiere.base/src/org/compiere/impexp/OFXFileBankStatementLoader.java +++ b/org.adempiere.base/src/org/compiere/impexp/OFXFileBankStatementLoader.java @@ -17,6 +17,7 @@ package org.compiere.impexp; import java.io.FileInputStream; +import java.io.IOException; import org.compiere.model.MBankStatementLoader; import org.xml.sax.SAXException; @@ -70,6 +71,13 @@ public final class OFXFileBankStatementLoader extends OFXBankStatementHandler im m_errorMessage = new StringBuffer("ErrorReadingData"); m_errorDescription = new StringBuffer(); } + finally + { + if (m_stream != null) + try { + m_stream.close(); + } catch (IOException e) {} + } return result; } // init diff --git a/org.adempiere.install/src/org/compiere/install/ConfigurationData.java b/org.adempiere.install/src/org/compiere/install/ConfigurationData.java index 572f2ae8e2..b48f0f5720 100644 --- a/org.adempiere.install/src/org/compiere/install/ConfigurationData.java +++ b/org.adempiere.install/src/org/compiere/install/ConfigurationData.java @@ -831,6 +831,13 @@ public class ConfigurationData if (log.isLoggable(Level.FINE)) log.fine(host + ":" + port + " - " + e.getMessage()); return false; } + finally + { + if (pingSocket != null) + try { + pingSocket.close(); + } catch (IOException e) {} + } if (!shouldBeUsed) log.warning("Open Socket " + host + ":" + port + " - " + pingSocket); diff --git a/org.adempiere.ui/src/org/compiere/apps/form/PayPrint.java b/org.adempiere.ui/src/org/compiere/apps/form/PayPrint.java index 58aebdcee0..f11e640eaa 100644 --- a/org.adempiere.ui/src/org/compiere/apps/form/PayPrint.java +++ b/org.adempiere.ui/src/org/compiere/apps/form/PayPrint.java @@ -346,8 +346,9 @@ public class PayPrint { if (pdfFile != null) { // increase the check document no by the number of pages of the generated pdf file - PdfReader document = new PdfReader(pdfFile.getAbsolutePath()); - lastDocumentNo += document.getNumberOfPages(); + try (PdfReader document = new PdfReader(pdfFile.getAbsolutePath())) { + lastDocumentNo += document.getNumberOfPages(); + } pdfList.add(pdfFile); } }