hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Fix additional potential resource leaks

Browse Source 
refs #337 refs #349
This commit is contained in:
Andreas Dangel
2017-04-14 12:34:06 +02:00
parent b37f42d355
commit 23ed813954
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pmd-core/src/main/java/net/sourceforge/pmd/RuleSetFactory.java
View File

@ -120,7 +120,9 @@ public class RuleSetFactory {
for (Language language : LanguageRegistry.findWithRuleSupport()) {
Properties props = new Properties();
rulesetsProperties = "rulesets/" + language.getTerseName() + "/rulesets.properties";
props.load(ResourceLoader.loadResourceAsStream(rulesetsProperties));
try (InputStream inputStream = ResourceLoader.loadResourceAsStream(rulesetsProperties);) {
props.load(inputStream);
}
String rulesetFilenames = props.getProperty("rulesets.filenames");
ruleSetReferenceIds.addAll(RuleSetReferenceId.parse(rulesetFilenames));
}

14
pmd-core/src/test/java/net/sourceforge/pmd/RuleSetReferenceIdTest.java
View File

@ -119,9 +119,10 @@ public class RuleSetReferenceIdTest {
RuleSetReferenceId ruleSetReferenceId = new RuleSetReferenceId(" " + rulesetUrl + " ");
assertRuleSetReferenceId(true, rulesetUrl, true, null, rulesetUrl, ruleSetReferenceId);
InputStream inputStream = ruleSetReferenceId.getInputStream(RuleSetReferenceIdTest.class.getClassLoader());
String loaded = IOUtils.toString(inputStream, "UTF-8");
assertEquals("xyz", loaded);
try (InputStream inputStream = ruleSetReferenceId.getInputStream(RuleSetReferenceIdTest.class.getClassLoader());) {
String loaded = IOUtils.toString(inputStream, "UTF-8");
assertEquals("xyz", loaded);
}
verify(1, headRequestedFor(urlEqualTo(path)));
verify(0, headRequestedFor(urlEqualTo("/profiles")));
@ -147,9 +148,10 @@ public class RuleSetReferenceIdTest {
assertRuleSetReferenceId(true, hostpart + path, false, "DummyBasicMockRule", hostpart + completePath,
ruleSetReferenceId);
InputStream inputStream = ruleSetReferenceId.getInputStream(RuleSetReferenceIdTest.class.getClassLoader());
String loaded = IOUtils.toString(inputStream, "UTF-8");
assertEquals(basicRuleSet, loaded);
try (InputStream inputStream = ruleSetReferenceId.getInputStream(RuleSetReferenceIdTest.class.getClassLoader());) {
String loaded = IOUtils.toString(inputStream, "UTF-8");
assertEquals(basicRuleSet, loaded);
}
verify(1, headRequestedFor(urlEqualTo(completePath)));
verify(1, headRequestedFor(urlEqualTo(path)));

5
pmd-test/src/main/java/net/sourceforge/pmd/AbstractLanguageVersionTest.java
View File

@ -117,7 +117,9 @@ public class AbstractLanguageVersionTest {
Properties props = new Properties();
String rulesetsProperties = "rulesets/" + simpleTerseName + "/rulesets.properties";
props.load(ResourceLoader.loadResourceAsStream(rulesetsProperties));
try (InputStream inputStream = ResourceLoader.loadResourceAsStream(rulesetsProperties);) {
props.load(inputStream);
}
String rulesetFilenames = props.getProperty("rulesets.filenames");
assertNotNull(rulesetFilenames);
@ -131,6 +133,7 @@ public class AbstractLanguageVersionTest {
for (String r : rulesets) {
InputStream stream = ResourceLoader.loadResourceAsStream(r);
assertNotNull(stream);
stream.close();
RuleSet ruleset = factory.createRuleSet(r);
assertNotNull(ruleset);
}