You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2018/09/25 17:08:54 UTC

[ignite-teamcity-bot] branch master updated: IGNITE-9541 Hotfix for old cache - Fixes #18.

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 de6ec19  IGNITE-9541 Hotfix for old cache - Fixes #18.
de6ec19 is described below

commit de6ec19b5f68edb5c186efe95c54e6ac3752903c
Author: Nikolai Kulagin <zz...@gmail.com>
AuthorDate: Tue Sep 25 20:04:37 2018 +0300

    IGNITE-9541 Hotfix for old cache - Fixes #18.
    
    Signed-off-by: Dmitriy Pavlov <dp...@apache.org>
---
 .../apache/ignite/ci/IgnitePersistentTeamcity.java | 67 ++++++++++++----------
 1 file changed, 38 insertions(+), 29 deletions(-)

diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
index 33497bb..837a9dc 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
@@ -443,50 +443,59 @@ public class IgnitePersistentTeamcity implements IAnalyticsEnabledTeamcity, ITea
                 idUntil = idUntil == -2 ? buildRefs.size() - 1 : idUntil;
             }
 
-            if (idSince == -1 || idUntil == -1)
-                return Collections.emptyList();
-            else if (idSince == -3 || idUntil == -3) {
+            if (idSince == -3 || idUntil == -3) {
                 AtomicBoolean stopFilter = new AtomicBoolean();
                 AtomicBoolean addBuild = new AtomicBoolean();
 
-                    return buildRefs.stream()
-                        .filter(b -> {
-                            if (stopFilter.get())
-                                return addBuild.get();
-
-                            Build build = getBuild(b.href);
-
-                            if (build == null || build.isFakeStub())
-                                return false;
+                return buildRefs.stream()
+                    .filter(b -> {
+                        if (stopFilter.get())
+                            return addBuild.get();
 
-                            Date date = build.getFinishDate();
+                        Build build = getBuild(b.href);
 
-                            if (sinceDate != null && untilDate != null)
-                                return (date.after(sinceDate) || date.equals(sinceDate)) &&
-                                    (date.before(untilDate) || date.equals(untilDate));
-                            else if (sinceDate != null) {
-                                if (date.after(sinceDate) || date.equals(sinceDate)) {
-                                    stopFilter.set(true);
-                                    addBuild.set(true);
+                        if (build == null || build.isFakeStub())
+                            return false;
 
-                                    return true;
-                                }
+                        Date date = build.getFinishDate();
 
-                                return false;
-                            }
+                        if (sinceDate != null && untilDate != null)
+                            if ((date.after(sinceDate) || date.equals(sinceDate)) &&
+                                (date.before(untilDate) || date.equals(untilDate)))
+                                return true;
                             else {
                                 if (date.after(untilDate)) {
                                     stopFilter.set(true);
                                     addBuild.set(false);
-
-                                    return false;
                                 }
 
+                                return false;
+                            }
+                        else if (sinceDate != null) {
+                            if (date.after(sinceDate) || date.equals(sinceDate)) {
+                                stopFilter.set(true);
+                                addBuild.set(true);
+
                                 return true;
                             }
-                        })
-                        .collect(Collectors.toList());
-                }
+
+                            return false;
+                        }
+                        else {
+                            if (date.after(untilDate)) {
+                                stopFilter.set(true);
+                                addBuild.set(false);
+
+                                return false;
+                            }
+
+                            return true;
+                        }
+                    })
+                    .collect(Collectors.toList());
+            }
+            else if (idSince == -1 || idUntil == -1)
+                return Collections.emptyList();
             else
                 return buildRefs.subList(idSince, idUntil + 1);
         }