[ignite-teamcity-bot] branch master updated: IGNITE-9333: NPE fixed

[dpavlov]

This is an automated email from the ASF dual-hosted git repository.

dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git


The following commit(s) were added to refs/heads/master by this push:
     new de6a8b6  IGNITE-9333: NPE fixed
de6a8b6 is described below

commit de6a8b655ab66517766adb6f5692b4f1879dfa88
Author: Dmitriy Pavlov <dpav...@apache.org>
AuthorDate: Tue Sep 11 17:00:14 2018 +0300

    IGNITE-9333: NPE fixed
---
 .../ignite/ci/web/model/current/BuildStatisticsSummary.java    | 10 +++++++++-
 ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js       |  6 +++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git 
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/BuildStatisticsSummary.java
 
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/BuildStatisticsSummary.java
index 2b73771..820d888 100644
--- 
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/BuildStatisticsSummary.java
+++ 
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/BuildStatisticsSummary.java
@@ -182,7 +182,15 @@ public class BuildStatisticsSummary extends UpdateInfo 
implements IBackgroundUpd
 
         return problems.stream()
             .filter(Objects::nonNull)
-            .filter(p -> buildTypeId == null || 
buildTypeId.equals(p.buildRef.buildTypeId)
+            .filter(p -> {
+                    if (buildTypeId == null)
+                        return true;
+                    if (p.buildRef == null && buildTypeId == null)
+                        return true;
+                    if (p.buildRef != null && 
buildTypeId.equals(p.buildRef.buildTypeId))
+                        return true;
+                    return false;
+                }
             );
     }
 
diff --git a/ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js 
b/ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js
index cdd09a3..3502592 100644
--- a/ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js
+++ b/ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js
@@ -184,7 +184,7 @@ function addBlockersData(server, settings) {
         blockers = "<tr bgcolor='#F5F5FF'><th colspan='3' 
class='table-title'><b>Possible Blockers</b></th>" +
             "<th  class='table-title'>Base Branch</th></tr>" +
             blockers +
-            "<tr bgcolor='#F5F5FF'><th colspan='3' 
class='table-title'><b>Other failures</b></th>" +
+            "<tr bgcolor='#F5F5FF'><th colspan='3' class='table-title'><b>All 
Failures</b></th>" +
             "<th  class='table-title'>Base Branch</th></tr>";
     }
 
@@ -666,7 +666,7 @@ function drawLatestRuns(latestRuns) {
         return "";
 
     var res = "";
-    res += "<nobr><span style='white-space: nowrap; width:" + 
(latestRuns.length  * 2) + "px; display: inline-block;' title='Latest master 
runs history from right to left is oldest to newest. 
Red-failed,green-passed,black-timeout'>";
+    res += "<nobr><span style='white-space: nowrap; width:" + 
(latestRuns.length  * 1) + "px; display: inline-block;' title='Latest master 
runs history from right to left is oldest to newest. 
Red-failed,green-passed,black-timeout'>";
 
     var len = 1;
     var prevState = null;
@@ -704,7 +704,7 @@ function drawLatestRunsBlock(state, len) {
     else if (state == 3)
         runColor = "black";
 
-    return "<span style='background-color: " + runColor + "; width:" + (len * 
2) + "px; height:10px; display: inline-block;'></span>";
+    return "<span style='background-color: " + runColor + "; width:" + (len * 
1) + "px; height:10px; display: inline-block;'></span>";
 }