From 561b9b6a1ff2a4782fb693b038a609f01ef34257 Mon Sep 17 00:00:00 2001
From: Matthias Dhellin <m.dhellin@dimsi.fr>
Date: Mon, 7 Oct 2024 17:32:12 +0200
Subject: [PATCH] Refactored some null checks

---
 .../backup/backroll/BackrollClient.java       | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/BackrollClient.java b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/BackrollClient.java
index fe462830853..a9dc0deebdc 100644
--- a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/BackrollClient.java
+++ b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/BackrollClient.java
@@ -286,18 +286,16 @@ public class BackrollClient {
 
             BackrollVmMetricsResponse vmMetricsResponse = waitGet(urlToRequest);
 
-            if (vmMetricsResponse != null) {
-                if (vmMetricsResponse.state.equals(TaskState.SUCCESS)) {
-                    LOG.debug("SUCCESS ok");
-                    if (vmMetricsResponse.infos != null) {
-                        if (vmMetricsResponse.infos.cache != null) {
-                            if (vmMetricsResponse.infos.cache.stats != null) {
-                                CacheStats stats = vmMetricsResponse.infos.cache.stats;
-                                long size = Long.parseLong(stats.totalSize);
-                                return new Metric(size, size);
-                            }
-                        }
-                    }
+            if (vmMetricsResponse != null && vmMetricsResponse.state.equals(TaskState.SUCCESS)) {
+                LOG.debug("SUCCESS ok");
+                CacheStats stats = null;
+                try {
+                    stats = vmMetricsResponse.infos.cache.stats;
+                } catch (NullPointerException e) {
+                }
+                if (stats != null) {
+                    long size = Long.parseLong(stats.totalSize);
+                    return new Metric(size, size);
                 }
             }
         } catch (final Exception e) {