[GitHub] [cloudstack] Pearl1594 commented on a change in pull request #5045: server: fixes NPE on empty vmware.root.disk.controller config

[GitBox <gi...@apache.org>]

Pearl1594 commented on a change in pull request #5045:
URL: https://github.com/apache/cloudstack/pull/5045#discussion_r641487890



##########
File path: server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
##########
@@ -4048,7 +4048,10 @@ public UserVmVO doInTransaction(TransactionStatus status) throws InsufficientCap
                         vm.setDetail(VmDetailConstants.FIRMWARE, "efi");
                         s_logger.info("guestOS is OSX : overwrite root disk controller to scsi, use smc and efi");
                     } else {
-                        String controllerSetting = _configDao.getValue("vmware.root.disk.controller");
+                        String controllerSetting = _configDao.getValue(Config.VmwareRootDiskControllerType.key());
+                        if (StringUtils.isEmpty(controllerSetting)) {
+                            controllerSetting = Config.VmwareRootDiskControllerType.getDefaultValue();
+                        }

Review comment:
       @shwstppr can we use this instead? 
   ```suggestion
   String controllerSetting = StringUtils.defaultIfEmpty(_configDao.getValue(Config.VmwareRootDiskControllerType.key()),
                                   Config.VmwareRootDiskControllerType.getDefaultValue());
   ```
   




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org