Repository: cloudstack Updated Branches: refs/heads/master b7ab95561 -> ff2ed3364
Fixed few coverity issues Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ff2ed336 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ff2ed336 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ff2ed336 Branch: refs/heads/master Commit: ff2ed3364562f30285994d96d93f1930c6d90f5f Parents: b7ab955 Author: Wei Zhou <w.z...@tech.leaseweb.com> Authored: Tue Dec 16 09:21:28 2014 +0100 Committer: Wei Zhou <w.z...@tech.leaseweb.com> Committed: Tue Dec 16 09:21:28 2014 +0100 ---------------------------------------------------------------------- .../cloudstack/api/response/SSHKeyPairResponse.java | 12 ++++++++++++ .../src/com/cloud/network/rules/RulesManagerImpl.java | 2 +- server/src/com/cloud/server/ManagementServerImpl.java | 5 +---- 3 files changed, 14 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ff2ed336/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java b/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java index 9121957..f494ad2 100644 --- a/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java @@ -66,14 +66,26 @@ public class SSHKeyPairResponse extends BaseResponse { this.fingerprint = fingerprint; } + public String getAccountName() { + return accountName; + } + public void setAccountName(String accountName) { this.accountName = accountName; } + public String getDomainId() { + return domainId; + } + public void setDomainId(String domainId) { this.domainId = domainId; } + public String getDomainName() { + return domain; + } + public void setDomainName(String domain) { this.domain = domain; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ff2ed336/server/src/com/cloud/network/rules/RulesManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java index e3d269d..39e0c1b 100644 --- a/server/src/com/cloud/network/rules/RulesManagerImpl.java +++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java @@ -1527,7 +1527,7 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules rule.setDisplay(forDisplay); } - if (rule.getSourcePortStart() != rule.getSourcePortEnd() && privatePort != null) { + if (!rule.getSourcePortStart().equals(rule.getSourcePortEnd()) && privatePort != null) { throw new InvalidParameterValueException("Unable to update the private port of port forwarding rule as the rule has port range : " + rule.getSourcePortStart() + " to " + rule.getSourcePortEnd()); } if (virtualMachineId == null && vmGuestIp != null) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ff2ed336/server/src/com/cloud/server/ManagementServerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index b525c0e..3f8f52f 100644 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -3611,11 +3611,8 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe String name = cmd.getName(); String key = cmd.getPublicKey(); try { - if (key != null) { - key = URLDecoder.decode(key, "UTF-8"); - } + key = URLDecoder.decode(key, "UTF-8"); } catch (UnsupportedEncodingException e) { - } finally { } String publicKey = SSHKeysHelper.getPublicKeyFromKeyMaterial(key);
