From 3d6cafe1936ed2403a1031cd5ad42dd205934412 Mon Sep 17 00:00:00 2001
From: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com>
Date: Thu, 30 Oct 2025 19:21:39 +0530
Subject: [PATCH] Handle null mountTimeout in RestoreBackupCommand (#11944)

---
 .../java/org/apache/cloudstack/backup/RestoreBackupCommand.java | 2 +-
 .../java/org/apache/cloudstack/backup/NASBackupProvider.java    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/apache/cloudstack/backup/RestoreBackupCommand.java b/core/src/main/java/org/apache/cloudstack/backup/RestoreBackupCommand.java
index 9cbb87da19a..8e68f4f1e41 100644
--- a/core/src/main/java/org/apache/cloudstack/backup/RestoreBackupCommand.java
+++ b/core/src/main/java/org/apache/cloudstack/backup/RestoreBackupCommand.java
@@ -149,7 +149,7 @@ public class RestoreBackupCommand extends Command  {
     }
 
     public Integer getMountTimeout() {
-        return this.mountTimeout;
+        return this.mountTimeout == null ? 0 : this.mountTimeout;
     }
 
     public void setMountTimeout(Integer mountTimeout) {
diff --git a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
index 3813cac0a33..3b2c2692b0d 100644
--- a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
+++ b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
@@ -405,6 +405,7 @@ public class NASBackupProvider extends AdapterBase implements BackupProvider, Co
         restoreCommand.setVmExists(null);
         restoreCommand.setVmState(vmNameAndState.second());
         restoreCommand.setRestoreVolumeUUID(backupVolumeInfo.getUuid());
+        restoreCommand.setMountTimeout(NASBackupRestoreMountTimeout.value());
 
         BackupAnswer answer;
         try {