(cloudstack) branch 4.20 updated: Set nfsVersion in ssvm agent.properties only if it is not null (#12445)

[da...@apache.org]

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

dahn pushed a commit to branch 4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.20 by this push:
     new cf36fb00008 Set nfsVersion in ssvm agent.properties only if it is not null (#12445)
cf36fb00008 is described below

commit cf36fb00008b3f7a71e155d0e408daa907fa04e3
Author: Abhisar Sinha <63...@users.noreply.github.com>
AuthorDate: Tue Jan 20 12:55:16 2026 +0530

    Set nfsVersion in ssvm agent.properties only if it is not null (#12445)
---
 .../cloudstack/secondarystorage/SecondaryStorageManagerImpl.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
index 5698632249d..c9bcb911000 100644
--- a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
+++ b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
@@ -1224,8 +1224,10 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar
         if (dc.getDns2() != null) {
             buf.append(" dns2=").append(dc.getDns2());
         }
-        String nfsVersion = imageStoreDetailsUtil != null ? imageStoreDetailsUtil.getNfsVersion(secStores.get(0).getId()) : null;
-        buf.append(" nfsVersion=").append(nfsVersion);
+        String nfsVersion = imageStoreDetailsUtil.getNfsVersion(secStores.get(0).getId());
+        if (StringUtils.isNotBlank(nfsVersion)) {
+            buf.append(" nfsVersion=").append(nfsVersion);
+        }
         buf.append(" keystore_password=").append(VirtualMachineGuru.getEncodedString(PasswordGenerator.generateRandomPassword(16)));
         String bootArgs = buf.toString();
         if (logger.isDebugEnabled()) {