address suggestions and fix double quote
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java index 4bcf04c..9b6e314 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -2426,10 +2426,7 @@ int _usageAggregationRange = NumbersUtil.parseInt(aggregationRange, 1440); int HOURLY_TIME = 60; final int DAILY_TIME = 60 * 24; - if (_usageAggregationRange == DAILY_TIME) { - _dailyOrHourly = true; - } else _dailyOrHourly = _usageAggregationRange == HOURLY_TIME; - + _dailyOrHourly = (_usageAggregationRange == DAILY_TIME || _usageAggregationRange == HOURLY_TIME); _itMgr.registerGuru(VirtualMachine.Type.User, this); VirtualMachine.State.getStateMachine().registerListener(new UserVmStateListener(_usageEventDao, _networkDao, _nicDao, serviceOfferingDao, _vmDao, this, _configDao)); @@ -3406,12 +3403,12 @@ throw new InvalidParameterValueException("Unable to find service offering: " + serviceOfferingId + " corresponding to the Instance"); } - Boolean enterSetup = cmd.getBootIntoSetup(); - if (enterSetup != null && enterSetup && !HypervisorType.VMware.equals(vmInstance.getHypervisorType())) { + boolean enterSetup = Boolean.TRUE.equals(cmd.getBootIntoSetup()); + if (enterSetup && !HypervisorType.VMware.equals(vmInstance.getHypervisorType())) { throw new InvalidParameterValueException("Booting into a hardware setup menu is not implemented on " + vmInstance.getHypervisorType()); } - UserVm userVm = rebootVirtualMachine(vmId, enterSetup != null && cmd.getBootIntoSetup(), cmd.isForced()); + UserVm userVm = rebootVirtualMachine(vmId, cmd.getBootIntoSetup(), cmd.isForced()); if (userVm != null ) { // update the vmIdCountMap if the vm is in advanced shared network with out services final List<NicVO> nics = _nicDao.listByVmId(vmId); @@ -4795,7 +4792,7 @@ validateRootDiskResize(hypervisorType, rootDiskSize, templateVO, vm, customParameters); } - vm.setDisplayVm(isDisplayVm == null || isDisplayVm); + vm.setDisplayVm(!Boolean.FALSE.equals(isDisplayVm)); setVmRequiredFieldsForImport(isImport, vm, zone, hypervisorType, host, lastHost, powerState); @@ -5298,7 +5295,7 @@ if (dc.getDns2() != null) { buf.append(" dns2=").append(dc.getDns2()); } - logger.info("cmdline details: {}”, buf); + logger.info("cmdline details: {}", buf); } @Override