From 7b04cd32f0e6c8ecc87573d2eecb7a68a131f9df Mon Sep 17 00:00:00 2001
From: sermakov-orion <122427547+sermakov-orion@users.noreply.github.com>
Date: Thu, 9 Jan 2025 15:43:45 +0300
Subject: [PATCH] core: make SecretValue Serializable + snapshot overview NPE
 fixes (Fixes: #900)

Since the SecretValue structure is used in GWT, it should implement Serializable interface.

Also add a couple of null checks to avoid NPE in the scenario explained in #900.

Signed-off-by: Stepan Ermakov <sermakov@orionsoft.ru>
---
 .../ovirt/engine/core/common/utils/SecretValue.java    |  5 ++++-
 .../common/widget/uicommon/vm/VmSnapshotInfoPanel.java | 10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SecretValue.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SecretValue.java
index 0237f9efdad..dad0fd335c3 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SecretValue.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SecretValue.java
@@ -1,8 +1,11 @@
 package org.ovirt.engine.core.common.utils;
 
+import java.io.Serializable;
 import java.util.Objects;
 
-public class SecretValue<T> {
+public class SecretValue<T> implements Serializable {
+    private static final long serialVersionUID = -7894728002078425194L;
+
     private T value;
 
     public T getValue() {
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoPanel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoPanel.java
index 404187eb7c3..6d605f0ed8f 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoPanel.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoPanel.java
@@ -1,10 +1,14 @@
 package org.ovirt.engine.ui.common.widget.uicommon.vm;
 
+import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 
 import org.gwtbootstrap3.client.ui.Label;
+import org.ovirt.engine.core.common.businessentities.network.NetworkInterface;
+import org.ovirt.engine.core.common.businessentities.network.NetworkStatistics;
 import org.ovirt.engine.core.common.businessentities.network.VmInterfaceType;
 import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
 import org.ovirt.engine.core.common.businessentities.storage.Disk;
@@ -266,8 +270,10 @@ protected Double getSpeed(VmNetworkInterface object) {
         AbstractTextColumn<VmNetworkInterface> dropsColumn = new AbstractSumUpColumn<VmNetworkInterface>() {
             @Override
             protected Double[] getRawValue(VmNetworkInterface object) {
-                Double receiveDrops = object != null ? object.getStatistics().getReceiveDrops().doubleValue() : null;
-                Double transmitDrops = object != null ? object.getStatistics().getTransmitDrops().doubleValue() : null;
+                Double receiveDrops = Optional.ofNullable(object).map(NetworkInterface::getStatistics)
+                        .map(NetworkStatistics::getReceiveDrops).map(BigInteger::doubleValue).orElse(null);
+                Double transmitDrops = Optional.ofNullable(object).map(NetworkInterface::getStatistics)
+                        .map(NetworkStatistics::getTransmitDrops).map(BigInteger::doubleValue).orElse(null);
                 return new Double[] { receiveDrops, transmitDrops };
             }
         };