From ab0a50453b112f04a0c3b5a0ce68e77aae0ffdf9 Mon Sep 17 00:00:00 2001
From: ikedam <devld@ikedam.jp>
Date: Wed, 3 Jun 2015 23:11:36 +0900
Subject: [PATCH] [FIXED JENKINS-28585] Skips aggregation processing if no
 publisher supports aggregation.

---
 .../ConditionalPublisher.java                 | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/jenkins_ci/plugins/flexible_publish/ConditionalPublisher.java b/src/main/java/org/jenkins_ci/plugins/flexible_publish/ConditionalPublisher.java
index b414d9c..15e8898 100644
--- a/src/main/java/org/jenkins_ci/plugins/flexible_publish/ConditionalPublisher.java
+++ b/src/main/java/org/jenkins_ci/plugins/flexible_publish/ConditionalPublisher.java
@@ -207,26 +207,26 @@ public boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher,
     }
 
     public ConditionalMatrixAggregator createAggregator(MatrixBuild build, Launcher launcher, BuildListener listener) {
-        if (isConfiguredAggregation()) {
-            // alerts if all publishers doesn't support aggregation
-            // even if configured for aggregation
-            boolean supportAggregation = false;
-            
-            for (BuildStep publisher: getPublisherList()) {
-                if (publisher instanceof MatrixAggregatable) {
-                    supportAggregation = true;
-                    break;
-                }
+        boolean supportAggregation = false;
+        
+        for (BuildStep publisher: getPublisherList()) {
+            if (publisher instanceof MatrixAggregatable) {
+                supportAggregation = true;
+                break;
             }
-            
-            if (!supportAggregation) {
+        }
+        
+        if (!supportAggregation) {
+            if (isConfiguredAggregation()) {
+                // alerts if all publishers doesn't support aggregation
+                // even if configured for aggregation
                 listener.getLogger().println(String.format(
                         "[%s] WARNING: Condition for Matrix Aggregation is configured for %s which does not support aggregation",
                         getDescriptor().getDisplayName(),
                         FlexiblePublisher.getBuildStepShortName(getPublisherList())
                 ));
-                return null;
             }
+            return null;
         }
         // First, decide whether the condition is satisfied
         // in the parent scope.