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 2019/03/11 18:06:01 UTC
[ignite-teamcity-bot] 02/02: IGNITE-11491: Revisions were added to
JAXB model & Compacted DB model for TC Bot: NPE fix
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-11461-2
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
commit d25a3b4198bedd8030ad6f8c02d0b0612ccec8c5
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Mon Mar 11 21:05:44 2019 +0300
IGNITE-11491: Revisions were added to JAXB model & Compacted DB model for TC Bot: NPE fix
---
.../ignite/ci/teamcity/ignited/ITeamcityIgnited.java | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/ITeamcityIgnited.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/ITeamcityIgnited.java
index 36a039c..77301e0 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/ITeamcityIgnited.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/ITeamcityIgnited.java
@@ -207,14 +207,17 @@ public interface ITeamcityIgnited {
@Nullable
public default String getLatestCommitVersion(FatBuildCompacted build) {
List<RevisionCompacted> revisions = build.revisions();
- Optional<String> any = revisions.stream()
- .map(RevisionCompacted::commitFullVersion)
- .filter(s -> !Strings.isNullOrEmpty(s))
- .findAny();
-
- if (any.isPresent())
- return any.get(); // Not so good for several VCS roots, probably should use collection here and concatenate.
+ if (revisions != null) {
+ Optional<String> any = revisions.stream()
+ .map(RevisionCompacted::commitFullVersion)
+ .filter(s -> !Strings.isNullOrEmpty(s))
+ .findAny();
+
+ if (any.isPresent())
+ return any.get(); // Not so good for several VCS roots, probably should use collection here and concatenate.
+ }
+ //fallback version of commit hash extraction
int changeMax = -1;
int[] changes = build.changes();
for (int i = 0; i < changes.length; i++) {