Repository: flex-utilities Updated Branches: refs/heads/develop b145b025c -> 681f02736
FLEX-34823: Improve error handling for bad data lines. Report the file and line number if a line in the data file is malformed. This can happen when the server is not shut down and therefore does not flush its data to disk. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/681f0273 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/681f0273 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/681f0273 Branch: refs/heads/develop Commit: 681f027363be1a2002149135569f4dc5a02da178 Parents: b145b02 Author: dloverin <darrell.love...@gmail.com> Authored: Sun Apr 26 18:29:56 2015 -0400 Committer: dloverin <darrell.love...@gmail.com> Committed: Sat May 9 11:03:16 2015 -0400 ---------------------------------------------------------------------- .../flex/tools/codecoverage/reporter/CodeCoverageReporter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/681f0273/CodeCoverage/JavaServer/java/src/org/apache/flex/tools/codecoverage/reporter/CodeCoverageReporter.java ---------------------------------------------------------------------- diff --git a/CodeCoverage/JavaServer/java/src/org/apache/flex/tools/codecoverage/reporter/CodeCoverageReporter.java b/CodeCoverage/JavaServer/java/src/org/apache/flex/tools/codecoverage/reporter/CodeCoverageReporter.java index 9a4bb0e..7c0d868 100755 --- a/CodeCoverage/JavaServer/java/src/org/apache/flex/tools/codecoverage/reporter/CodeCoverageReporter.java +++ b/CodeCoverage/JavaServer/java/src/org/apache/flex/tools/codecoverage/reporter/CodeCoverageReporter.java @@ -454,9 +454,9 @@ public class CodeCoverageReporter { // "id,linenum" // Split line and record linenum as a hit. - if (firstChar >= '0' && firstChar <= '9') + String[] results = inLine.split(","); + if (results.length == 2 && firstChar >= '0' && firstChar <= '9') { - String[] results = inLine.split(","); String file = stringPool.get(Integer.valueOf(results[0])); int hitLineNumber = Integer.valueOf(results[1]); coverageData.setLineExecuted(file, hitLineNumber); @@ -464,7 +464,7 @@ public class CodeCoverageReporter } else { - System.err.println("Warning: line " + inLineNumber + ": unrecognized data, " + inLine); + System.err.println("Warning: file " + inFile.getAbsolutePath() + ", line " + inLineNumber + ": unrecognized data, " + inLine); } } }