Shahar Havivi has uploaded a new change for review. Change subject: findbugs: Method fail to close stream ......................................................................
findbugs: Method fail to close stream Change-Id: I5bea678c1aaeeb6dfe92b16e380e4bc631e3d09c Signed-off-by: Shahar Havivi <[email protected]> --- M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/archivers/tar/TarTest.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TestCommon.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TransferTest.java 5 files changed, 24 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/14037/1 diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java index ace43a7..ce42c3f 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java @@ -1,5 +1,6 @@ package org.ovirt.engine.core.dao; +import java.io.InputStream; import java.sql.Connection; import java.sql.Statement; import java.util.Properties; @@ -109,8 +110,10 @@ if (number == null) number = ""; String schemaNamePostfix = job + number; - properties.load(BaseDAOTestCase.class.getResourceAsStream( - "/test-database.properties")); + InputStream is = BaseDAOTestCase.class.getResourceAsStream( + "/test-database.properties"); + properties.load(is); + is.close(); ClassLoader.getSystemClassLoader().loadClass( properties.getProperty("database.driver")); String dbUrl = properties.getProperty("database.url") + schemaNamePostfix; diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java index 61a0222..770954b 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java @@ -12,6 +12,8 @@ import java.util.List; import java.util.Properties; +import java.io.InputStream; + import javax.sql.DataSource; import org.junit.After; @@ -127,8 +129,10 @@ Config.setConfigUtils(new DBConfigUtils(false)); try { - properties.load(super.getClass().getResourceAsStream( - "/test-database.properties")); + InputStream is = super.getClass().getResourceAsStream( + "/test-database.properties"); + properties.load(is); + is.close(); ClassLoader.getSystemClassLoader().loadClass( properties.getProperty("database.driver")); result = new SingleConnectionDataSource( diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/archivers/tar/TarTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/archivers/tar/TarTest.java index ab6f71c..036bec3 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/archivers/tar/TarTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/archivers/tar/TarTest.java @@ -54,9 +54,10 @@ else { MessageDigest fmd = MessageDigest.getInstance(md.getAlgorithm()); InputStream fis = null; + InputStream is = null; try { fis = new FileInputStream(fullFile); - InputStream is = new DigestInputStream(fis, fmd); + is = new DigestInputStream(fis, fmd); StringBuffer content = new StringBuffer(1024); byte buf[] = new byte[1024]; int n; @@ -72,6 +73,13 @@ // ignore } } + if (is != null) { + try { + is.close(); + } catch (IOException e) { + // ignore + } + } } } } diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TestCommon.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TestCommon.java index 37b5618..d1492a0 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TestCommon.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TestCommon.java @@ -83,7 +83,9 @@ try { KeyStore keyStore = KeyStore.getInstance("PKCS12"); - keyStore.load(new FileInputStream(p12), p12_password.toCharArray()); + FileInputStream fis = new FileInputStream(p12); + keyStore.load(fis, p12_password.toCharArray()); + fis.close(); KeyStore.PrivateKeyEntry entry = (KeyStore.PrivateKeyEntry)keyStore.getEntry("1", new KeyStore.PasswordProtection(p12_password.toCharArray())); keyPair = new KeyPair(entry.getCertificate().getPublicKey(), entry.getPrivateKey()); } diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TransferTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TransferTest.java index 387753f..3f43ffb 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TransferTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TransferTest.java @@ -43,6 +43,7 @@ while ((n = is.read(buffer)) != -1) { digest.update(buffer, 0, n); } + is.close(); return digest.digest(); } -- To view, visit http://gerrit.ovirt.org/14037 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5bea678c1aaeeb6dfe92b16e380e4bc631e3d09c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
