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

Bug fix: creating InputStream in different thread lead to resource exhaustion on Linux...; unexepected exception in worker threads now shutdowns the ExecutorService right away

Browse Source 
git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@4878 51baf565-9d33-0410-a72c-fc3788e3496d
This commit is contained in:
Xavier Le Vourch
2006-12-14 04:43:22 +00:00
parent 1664005b21
commit dea96e3059
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pmd/src/net/sourceforge/pmd/PMD.java
View File

@ -291,15 +291,17 @@ public class PMD {
}
private static class PmdRunnable extends PMD implements Runnable {
private final InputStream inputStream;
private final ExecutorService executor;
private final DataSource dataSource;
private final String fileName;
private final boolean debugEnabled;
private final String encoding;
private final String rulesets;
public PmdRunnable(InputStream inputStream, String fileName, SourceType sourceType,
public PmdRunnable(ExecutorService executor, DataSource dataSource, String fileName, SourceType sourceType,
boolean debugEnabled, String encoding, String rulesets, String excludeMarker) {
this.inputStream = inputStream;
this.executor = executor;
this.dataSource = dataSource;
this.fileName = fileName;
this.debugEnabled = debugEnabled;
this.encoding = encoding;
@ -321,7 +323,7 @@ public class PMD {
}
try {
InputStream stream = new BufferedInputStream(inputStream);
InputStream stream = new BufferedInputStream(dataSource.getInputStream());
processFile(stream, encoding, rs, ctx);
} catch (PMDException pmde) {
if (debugEnabled) {
@ -330,6 +332,16 @@ public class PMD {
ctx.getReport().addError(
new Report.ProcessingError(pmde.getMessage(),
fileName));
} catch (Throwable t) {
// unexepected exception: log and stop executor service
if (debugEnabled) {
t.printStackTrace();
}
ctx.getReport().addError(
new Report.ProcessingError(t.getMessage(),
fileName));
executor.shutdownNow();
}
}
@ -404,9 +416,8 @@ public class PMD {
DataSource dataSource = (DataSource) i.next();
String niceFileName = dataSource.getNiceFileName(shortNamesEnabled,
inputPath);
InputStream is = dataSource.getInputStream();
Runnable r = new PmdRunnable(is, niceFileName, sourceType, debugEnabled,
Runnable r = new PmdRunnable(executor, dataSource, niceFileName, sourceType, debugEnabled,
encoding, rulesets, excludeMarker);
executor.execute(r);