[syncope] branch master updated: [SYNCOPE-1614] Avoid Console loading failure when git information is not available through Core actuator/info

[ilgrosso]

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

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/master by this push:
     new c9b5da8b71 [SYNCOPE-1614] Avoid Console loading failure when git 
information is not available through Core actuator/info
c9b5da8b71 is described below

commit c9b5da8b7142515f993e5a4544551374ff77711c
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Fri Nov 4 15:32:51 2022 +0100

    [SYNCOPE-1614] Avoid Console loading failure when git information is not 
available through Core actuator/info
---
 .../src/main/java/org/apache/syncope/client/lib/SyncopeClient.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/client/idrepo/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
 
b/client/idrepo/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
index aecbfa49c0..8b18388f46 100644
--- 
a/client/idrepo/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
+++ 
b/client/idrepo/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
@@ -33,6 +33,7 @@ import javax.ws.rs.core.EntityTag;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.lang3.tuple.Triple;
 import org.apache.cxf.configuration.jsse.TLSClientParameters;
@@ -164,9 +165,10 @@ public class SyncopeClient {
 
     public Pair<String, String> gitAndBuildInfo() {
         try {
+            JsonNode info = info();
             return Pair.of(
-                    info().get("git").get("commit").get("id").asText(),
-                    info().get("build").get("version").asText());
+                    info.has("git") ? 
info.get("git").get("commit").get("id").asText() : StringUtils.EMPTY,
+                    info.get("build").get("version").asText());
         } catch (IOException e) {
             throw new RuntimeException("While getting build and git Info", e);
         }