Repository: cloudstack Updated Branches: refs/heads/master fc2002341 -> 433ec7c85
Fixed few issues reproted by coverity. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/433ec7c8 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/433ec7c8 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/433ec7c8 Branch: refs/heads/master Commit: 433ec7c856ffb11d5bc160f45ded0b9d71392f64 Parents: fc20023 Author: Likitha Shetty <likitha.she...@citrix.com> Authored: Mon Aug 25 16:11:11 2014 +0530 Committer: Likitha Shetty <likitha.she...@citrix.com> Committed: Mon Aug 25 16:11:58 2014 +0530 ---------------------------------------------------------------------- .../com/cloud/configuration/ConfigurationManagerImpl.java | 10 +++++----- server/src/com/cloud/network/NetworkServiceImpl.java | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/433ec7c8/server/src/com/cloud/configuration/ConfigurationManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index bfa79a2..9cef442 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -3251,11 +3251,11 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if ((accountName != null) && (domainId != null)) { vlanOwner = _accountDao.findActiveAccount(accountName, domainId); - if (vlanOwner == null) { - throw new InvalidParameterValueException("Unable to find account by name " + accountName); - } else if (vlanOwner.getId() == Account.ACCOUNT_ID_SYSTEM) { - throw new InvalidParameterValueException("Please specify a valid account. Cannot dedicate IP range to system account"); - } + } + if (vlanOwner == null) { + throw new InvalidParameterValueException("Unable to find account by name " + accountName); + } else if (vlanOwner.getId() == Account.ACCOUNT_ID_SYSTEM) { + throw new InvalidParameterValueException("Please specify a valid account. Cannot dedicate IP range to system account"); } // Check if range is valid http://git-wip-us.apache.org/repos/asf/cloudstack/blob/433ec7c8/server/src/com/cloud/network/NetworkServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java index 5e231e9..e161e3f 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -3014,9 +3014,9 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { if ((accountName != null) && (domainId != null)) { vlanOwner = _accountDao.findActiveAccount(accountName, domainId); - if (vlanOwner == null) { - throw new InvalidParameterValueException("Unable to find account by name " + accountName); - } + } + if (vlanOwner == null) { + throw new InvalidParameterValueException("Unable to find account by name " + accountName); } vlanOwnerId = vlanOwner.getAccountId();
