[JENKINS-17037] added message if clover xml is incompatible with clov…

…er style
jenkinsci · Mar 13, 2013 · c70e441 · c70e441
1 parent 8daa40a
commit c70e441
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/cloverphp/CloverCoverageParser.java b/src/main/java/org/jenkinsci/plugins/cloverphp/CloverCoverageParser.java
@@ -84,7 +84,11 @@ public static ProjectCoverage parse(InputStream in) throws IOException {
         digester.addSetNext("coverage/project/file/class", "addClassCoverage", ClassCoverage.class.getName());
 
         try {
-            return (ProjectCoverage) digester.parse(in);
+            ProjectCoverage coverage = (ProjectCoverage) digester.parse(in);
+            if (coverage == null) {
+                throw new IOException("coverage report seems to be incompatible with clover style.");
+            }
+            return coverage;
         } catch (SAXException e) {
             throw new IOException2("Cannot parse coverage results", e);
         }

diff --git a/src/main/java/org/jenkinsci/plugins/cloverphp/CloverPublisher.java b/src/main/java/org/jenkinsci/plugins/cloverphp/CloverPublisher.java
@@ -218,6 +218,7 @@ private void processCloverXml(AbstractBuild<?, ?> build, BuildListener listener,
                 Util.displayIOException(e, listener);
                 e.printStackTrace(listener.fatalError("Unable to parse " + cloverXmlReport));
                 build.setResult(Result.FAILURE);
+                result = new ProjectCoverage();
             }
             final CloverBuildAction action = CloverBuildAction.load(build, workspacePath, result, healthyTarget, unhealthyTarget);