Merge pull request #66 from mbarrien/empty-enumset

JENKINS-6425 Avoid EnumSet.copyOf of empty sets
jenkinsci · Apr 25, 2017 · 2c4f8d9 · 2c4f8d9
2 parents 1cf41b4 + 1196149
commit 2c4f8d9
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/cobertura/targets/CoverageResult.java b/src/main/java/hudson/plugins/cobertura/targets/CoverageResult.java
@@ -351,14 +351,16 @@ public Ratio getCoverageWithEmpty(CoverageMetric metric) {
      * @return Value for property 'metrics'.
      */
     public Set<CoverageMetric> getMetrics() {
-        return Collections.unmodifiableSet(EnumSet.copyOf(aggregateResults.keySet()));
+        return Collections.unmodifiableSet(
+            aggregateResults.isEmpty() ? EnumSet.noneOf(CoverageMetric.class) : EnumSet.copyOf(aggregateResults.keySet()));
     }
 
     public Set<CoverageMetric> getMetricsWithEmpty() {
         Map<CoverageMetric, Ratio> currMetricSet = new EnumMap<CoverageMetric, Ratio>(CoverageMetric.class);
         currMetricSet.putAll(aggregateResults);
         fixEmptyMetrics(findEmptyMetrics(currMetricSet), currMetricSet);
-        return Collections.unmodifiableSet(EnumSet.copyOf(currMetricSet.keySet()));
+        return Collections.unmodifiableSet(
+            currMetricSet.isEmpty() ? EnumSet.noneOf(CoverageMetric.class) : EnumSet.copyOf(currMetricSet.keySet()));
     }
 
     private List<CoverageMetric> findEmptyMetrics(Map<CoverageMetric, Ratio> currMetricSet){