phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #1508 [core] [java] PMD is leaking file handles

Browse Source 
Fixes InputStreams and Readers
This commit is contained in:
Andreas Dangel
2016-07-25 21:25:34 +02:00
parent 648e697ab0
commit 88d1823c2e
7 changed files with 77 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pmd-core/src/main/java/net/sourceforge/pmd/PMD.java
View File

@ -22,12 +22,20 @@ import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.commons.io.IOUtils;
import net.sourceforge.pmd.benchmark.Benchmark;
import net.sourceforge.pmd.benchmark.Benchmarker;
import net.sourceforge.pmd.benchmark.TextReport;
import net.sourceforge.pmd.cli.PMDCommandLineInterface;
import net.sourceforge.pmd.cli.PMDParameters;
import net.sourceforge.pmd.lang.*;
import net.sourceforge.pmd.lang.Language;
import net.sourceforge.pmd.lang.LanguageFilenameFilter;
import net.sourceforge.pmd.lang.LanguageVersion;
import net.sourceforge.pmd.lang.LanguageVersionDiscoverer;
import net.sourceforge.pmd.lang.LanguageVersionHandler;
import net.sourceforge.pmd.lang.Parser;
import net.sourceforge.pmd.lang.ParserOptions;
import net.sourceforge.pmd.processor.MonoThreadProcessor;
import net.sourceforge.pmd.processor.MultiThreadProcessor;
import net.sourceforge.pmd.renderers.Renderer;
@ -500,6 +508,8 @@ public class PMD {
pmdVersion = properties.getProperty("version");
} catch (IOException e) {
LOG.log(Level.FINE, "Couldn't determine version of PMD", e);
} finally {
IOUtils.closeQuietly(stream);
}
}
if (pmdVersion == null) {

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

@ -30,6 +30,7 @@ import net.sourceforge.pmd.lang.rule.properties.factories.PropertyDescriptorUtil
import net.sourceforge.pmd.util.ResourceLoader;
import net.sourceforge.pmd.util.StringUtil;
import org.apache.commons.io.IOUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@ -287,6 +288,8 @@ public class RuleSetFactory {
return classNotFoundProblem(ioe);
} catch (SAXException se) {
return classNotFoundProblem(se);
} finally {
IOUtils.closeQuietly(inputStream);
}
}
@ -622,9 +625,11 @@ public class RuleSetFactory {
*/
private boolean containsRule(RuleSetReferenceId ruleSetReferenceId, String ruleName) {
boolean found = false;
InputStream ruleset = null;
try {
ruleset = ruleSetReferenceId.getInputStream(classLoader);
DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
Document document = builder.parse(ruleSetReferenceId.getInputStream(classLoader));
Document document = builder.parse(ruleset);
Element ruleSetElement = document.getDocumentElement();
NodeList rules = ruleSetElement.getElementsByTagName("rule");
@ -639,6 +644,8 @@ public class RuleSetFactory {
}
} catch (Exception e) {
throw new RuntimeException(e);
} finally {
IOUtils.closeQuietly(ruleset);
}
return found;

25
pmd-core/src/main/java/net/sourceforge/pmd/benchmark/Benchmarker.java
View File

@ -130,11 +130,12 @@ public class Benchmarker {
long start = System.currentTimeMillis();
for (DataSource dataSource: dataSources) {
parser.parse(
dataSource.getNiceFileName(false, null),
new InputStreamReader(dataSource.getInputStream()
)
);
InputStreamReader reader = new InputStreamReader(dataSource.getInputStream());
try {
parser.parse(dataSource.getNiceFileName(false, null), reader);
} finally {
IOUtils.closeQuietly(reader);
}
}
if (debug) {
@ -169,13 +170,15 @@ public class Benchmarker {
RuleContext ctx = new RuleContext();
long start = System.currentTimeMillis();
Reader reader = null;
for (DataSource dataSource: dataSources) {
reader = new InputStreamReader(dataSource.getInputStream());
ctx.setSourceCodeFilename(dataSource.getNiceFileName(false, null));
new SourceCodeProcessor(config).processSourceCode(reader, ruleSets, ctx);
IOUtils.closeQuietly(reader);
}
Reader reader = new InputStreamReader(dataSource.getInputStream());
try {
ctx.setSourceCodeFilename(dataSource.getNiceFileName(false, null));
new SourceCodeProcessor(config).processSourceCode(reader, ruleSets, ctx);
} finally {
IOUtils.closeQuietly(reader);
}
}
long end = System.currentTimeMillis();
long elapsed = end - start;
results.add(new RuleDuration(elapsed, rule));

8
pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/UsageGraphBuilder.java
View File

@ -8,6 +8,8 @@ import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.commons.io.IOUtils;
import org.objectweb.asm.AnnotationVisitor;
import org.objectweb.asm.Attribute;
import org.objectweb.asm.ClassReader;
@ -51,7 +53,11 @@ public class UsageGraphBuilder {
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(
classResourceName + ".class");
ClassReader classReader = new ClassReader(inputStream);
classReader.accept(getNewClassVisitor(), 0);
try {
classReader.accept(getNewClassVisitor(), 0);
} finally {
IOUtils.closeQuietly(inputStream);
}
}
}
} catch (IOException e) {

12
pmd-core/src/main/java/net/sourceforge/pmd/util/database/DBType.java
View File

@ -7,12 +7,15 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
import java.util.PropertyResourceBundle;
import java.util.ResourceBundle;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.commons.io.IOUtils;
/**
* Encapsulate the settings needed to access database source code.
*
@ -155,6 +158,7 @@ public class DBType {
LOGGER.entering(CLASS_NAME, matchString);
// Locale locale = Control.g;
ResourceBundle resourceBundle = null;
InputStream stream = null;
if (LOGGER.isLoggable(Level.FINEST)) {
LOGGER.finest("class_path+" + System.getProperty("java.class.path"));
@ -170,7 +174,8 @@ public class DBType {
if (LOGGER.isLoggable(Level.FINEST)) {
LOGGER.finest("Attempting File no file suffix: " + matchString);
}
resourceBundle = new PropertyResourceBundle(new FileInputStream(propertiesFile));
stream = new FileInputStream(propertiesFile);
resourceBundle = new PropertyResourceBundle(stream);
propertiesSource = propertiesFile.getAbsolutePath();
LOGGER.finest("FileSystemWithoutExtension");
} catch (FileNotFoundException notFoundOnFilesystemWithoutExtension) {
@ -180,7 +185,8 @@ public class DBType {
}
try {
File propertiesFile = new File(matchString + ".properties");
resourceBundle = new PropertyResourceBundle(new FileInputStream(propertiesFile));
stream = new FileInputStream(propertiesFile);
resourceBundle = new PropertyResourceBundle(stream);
propertiesSource = propertiesFile.getAbsolutePath();
LOGGER.finest("FileSystemWithExtension");
} catch (FileNotFoundException notFoundOnFilesystemWithExtensionTackedOn) {
@ -207,6 +213,8 @@ public class DBType {
}
}
}
} finally {
IOUtils.closeQuietly(stream);
}
// Properties in this matched resource

18
pmd-core/src/main/java/net/sourceforge/pmd/util/designer/Designer.java
View File

@ -22,6 +22,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
import java.io.StringWriter;
import java.lang.reflect.Proxy;
@ -90,6 +91,12 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import org.apache.commons.io.IOUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
import org.xml.sax.SAXException;
import net.sourceforge.pmd.PMD;
import net.sourceforge.pmd.PMDConfiguration;
import net.sourceforge.pmd.RuleContext;
@ -114,11 +121,6 @@ import net.sourceforge.pmd.lang.symboltable.ScopedNode;
import net.sourceforge.pmd.lang.xpath.Initializer;
import net.sourceforge.pmd.util.StringUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
import org.xml.sax.SAXException;
public class Designer implements ClipboardOwner {
private int getDefaultLanguageVersionSelectionIndex() {
@ -953,11 +955,13 @@ public class Designer implements ClipboardOwner {
+ System.getProperty("file.separator") + ".pmd_designer.xml";
private void loadSettings() {
InputStream stream = null;
try {
File file = new File(SETTINGS_FILE_NAME);
if (file.exists()) {
DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
Document document = builder.parse(new FileInputStream(file));
stream = new FileInputStream(file);
Document document = builder.parse(stream);
Element settingsElement = document.getDocumentElement();
Element codeElement = (Element) settingsElement.getElementsByTagName("code").item(0);
Element xpathElement = (Element) settingsElement.getElementsByTagName("xpath").item(0);
@ -984,6 +988,8 @@ public class Designer implements ClipboardOwner {
e.printStackTrace();
} catch (SAXException e) {
e.printStackTrace();
} finally {
IOUtils.closeQuietly(stream);
}
}

18
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/PMDASMClassLoader.java
View File

@ -4,6 +4,7 @@
package net.sourceforge.pmd.lang.java.typeresolution;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@ -12,6 +13,7 @@ import java.util.Set;
import net.sourceforge.pmd.lang.java.typeresolution.visitors.PMDASMVisitor;
import org.apache.commons.io.IOUtils;
import org.objectweb.asm.ClassReader;
/*
@ -80,8 +82,10 @@ public final class PMDASMClassLoader extends ClassLoader {
if (dontBother.contains(name)) {
throw new ClassNotFoundException(name);
}
InputStream stream = null;
try {
ClassReader reader = new ClassReader(getResourceAsStream(name.replace('.', '/') + ".class"));
stream = getResourceAsStream(name.replace('.', '/') + ".class");
ClassReader reader = new ClassReader(stream);
PMDASMVisitor asmVisitor = new PMDASMVisitor();
reader.accept(asmVisitor, 0);
@ -90,14 +94,22 @@ public final class PMDASMClassLoader extends ClassLoader {
inner = new ArrayList<String>(inner); // to avoid
// ConcurrentModificationException
for (String str : inner) {
reader = new ClassReader(getResourceAsStream(str.replace('.', '/') + ".class"));
reader.accept(asmVisitor, 0);
InputStream innerClassStream = null;
try {
innerClassStream = getResourceAsStream(str.replace('.', '/') + ".class");
reader = new ClassReader(innerClassStream);
reader.accept(asmVisitor, 0);
} finally {
IOUtils.closeQuietly(innerClassStream);
}
}
}
return asmVisitor.getPackages();
} catch (IOException e) {
dontBother.add(name);
throw new ClassNotFoundException(name, e);
} finally {
IOUtils.closeQuietly(stream);
}
}
}