You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2014/11/11 16:29:03 UTC
git commit: updated refs/heads/master to edf1047
Repository: cloudstack
Updated Branches:
refs/heads/master 5759857ff -> edf1047a2
CLOUDSTACK-7706: Coverity defects
Signed-off-by: Santhosh Edukulla <sa...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/edf1047a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/edf1047a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/edf1047a
Branch: refs/heads/master
Commit: edf1047a20b6d44fa5fc4be50d13dc833f83fe96
Parents: 5759857
Author: Harikrishna Patnala <ha...@citrix.com>
Authored: Tue Nov 11 15:00:42 2014 +0530
Committer: Santhosh Edukulla <sa...@gmail.com>
Committed: Tue Nov 11 20:58:45 2014 +0530
----------------------------------------------------------------------
.../api/command/admin/offering/CreateServiceOfferingCmd.java | 6 +++---
.../api/command/user/template/RegisterTemplateCmd.java | 2 +-
.../org/apache/cloudstack/api/command/test/ListCfgCmdTest.java | 3 ---
.../apache/cloudstack/api/command/test/UpdateCfgCmdTest.java | 3 ---
.../src/com/cloud/configuration/ConfigurationManagerImpl.java | 4 ----
server/src/com/cloud/server/ManagementServerImpl.java | 3 ---
6 files changed, 4 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/edf1047a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
index 36e1a25..0bde79b 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
@@ -167,15 +167,15 @@ public class CreateServiceOfferingCmd extends BaseCmd {
}
public Boolean getOfferHa() {
- return offerHa == null ? false : offerHa;
+ return offerHa == null ? Boolean.FALSE : offerHa;
}
public Boolean GetLimitCpuUse() {
- return limitCpuUse == null ? false : limitCpuUse;
+ return limitCpuUse == null ? Boolean.FALSE : limitCpuUse;
}
public Boolean getVolatileVm() {
- return isVolatile == null ? false : isVolatile;
+ return isVolatile == null ? Boolean.FALSE : isVolatile;
}
public String getStorageType() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/edf1047a/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
index f478c9b..c0ad345 100644
--- a/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
@@ -227,7 +227,7 @@ public class RegisterTemplateCmd extends BaseCmd {
}
public Boolean isDynamicallyScalable() {
- return isDynamicallyScalable == null ? false : isDynamicallyScalable;
+ return isDynamicallyScalable == null ? Boolean.FALSE : isDynamicallyScalable;
}
public Boolean isRoutingType() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/edf1047a/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
index 6b56591..7911943 100644
--- a/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
+++ b/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
@@ -43,9 +43,6 @@ public class ListCfgCmdTest extends TestCase {
private ManagementService mgr;
private ResponseGenerator responseGenerator;
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
-
@Override
@Before
public void setUp() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/edf1047a/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
index a07608a..63c4a03 100644
--- a/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
+++ b/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
@@ -40,9 +40,6 @@ public class UpdateCfgCmdTest extends TestCase {
private ConfigurationService configService;
private ResponseGenerator responseGenerator;
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
-
@Override
@Before
public void setUp() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/edf1047a/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 1f71c0f..84fe50a 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -1950,10 +1950,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
DomainVO domainVO = null;
- if (userId == null) {
- userId = User.UID_SYSTEM;
- }
-
if (domainId != null) {
domainVO = _domainDao.findById(domainId);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/edf1047a/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 deb2424..e089cd1 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -1696,9 +1696,6 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
if (scope != null && !scope.isEmpty()) {
// getting the list of parameters at requested scope
- if (id == null) {
- throw new InvalidParameterValueException("Invalid id null, id is needed corresponding to the scope");
- }
sc.addAnd("scope", SearchCriteria.Op.EQ, scope);
}
Re: git commit: updated refs/heads/master to edf1047
Posted by Daan Hoogland <da...@gmail.com>.
Santhosh,
can you stage these changes in a fix branch and make a more
descriptive message, please?
/me nagging and knowing it,
On Tue, Nov 11, 2014 at 4:29 PM, <sa...@apache.org> wrote:
> Repository: cloudstack
> Updated Branches:
> refs/heads/master 5759857ff -> edf1047a2
>
>
> CLOUDSTACK-7706: Coverity defects
>
> Signed-off-by: Santhosh Edukulla <sa...@gmail.com>
>
>
> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
> Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/edf1047a
> Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/edf1047a
> Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/edf1047a
>
> Branch: refs/heads/master
> Commit: edf1047a20b6d44fa5fc4be50d13dc833f83fe96
> Parents: 5759857
> Author: Harikrishna Patnala <ha...@citrix.com>
> Authored: Tue Nov 11 15:00:42 2014 +0530
> Committer: Santhosh Edukulla <sa...@gmail.com>
> Committed: Tue Nov 11 20:58:45 2014 +0530
>
> ----------------------------------------------------------------------
> .../api/command/admin/offering/CreateServiceOfferingCmd.java | 6 +++---
> .../api/command/user/template/RegisterTemplateCmd.java | 2 +-
> .../org/apache/cloudstack/api/command/test/ListCfgCmdTest.java | 3 ---
> .../apache/cloudstack/api/command/test/UpdateCfgCmdTest.java | 3 ---
> .../src/com/cloud/configuration/ConfigurationManagerImpl.java | 4 ----
> server/src/com/cloud/server/ManagementServerImpl.java | 3 ---
> 6 files changed, 4 insertions(+), 17 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/edf1047a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
> ----------------------------------------------------------------------
> diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
> index 36e1a25..0bde79b 100644
> --- a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
> +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
> @@ -167,15 +167,15 @@ public class CreateServiceOfferingCmd extends BaseCmd {
> }
>
> public Boolean getOfferHa() {
> - return offerHa == null ? false : offerHa;
> + return offerHa == null ? Boolean.FALSE : offerHa;
> }
>
> public Boolean GetLimitCpuUse() {
> - return limitCpuUse == null ? false : limitCpuUse;
> + return limitCpuUse == null ? Boolean.FALSE : limitCpuUse;
> }
>
> public Boolean getVolatileVm() {
> - return isVolatile == null ? false : isVolatile;
> + return isVolatile == null ? Boolean.FALSE : isVolatile;
> }
>
> public String getStorageType() {
>
> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/edf1047a/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
> ----------------------------------------------------------------------
> diff --git a/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
> index f478c9b..c0ad345 100644
> --- a/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
> +++ b/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
> @@ -227,7 +227,7 @@ public class RegisterTemplateCmd extends BaseCmd {
> }
>
> public Boolean isDynamicallyScalable() {
> - return isDynamicallyScalable == null ? false : isDynamicallyScalable;
> + return isDynamicallyScalable == null ? Boolean.FALSE : isDynamicallyScalable;
> }
>
> public Boolean isRoutingType() {
>
> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/edf1047a/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
> ----------------------------------------------------------------------
> diff --git a/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
> index 6b56591..7911943 100644
> --- a/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
> +++ b/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
> @@ -43,9 +43,6 @@ public class ListCfgCmdTest extends TestCase {
> private ManagementService mgr;
> private ResponseGenerator responseGenerator;
>
> - @Rule
> - public ExpectedException expectedException = ExpectedException.none();
> -
> @Override
> @Before
> public void setUp() {
>
> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/edf1047a/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
> ----------------------------------------------------------------------
> diff --git a/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
> index a07608a..63c4a03 100644
> --- a/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
> +++ b/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
> @@ -40,9 +40,6 @@ public class UpdateCfgCmdTest extends TestCase {
> private ConfigurationService configService;
> private ResponseGenerator responseGenerator;
>
> - @Rule
> - public ExpectedException expectedException = ExpectedException.none();
> -
> @Override
> @Before
> public void setUp() {
>
> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/edf1047a/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 1f71c0f..84fe50a 100755
> --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
> +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
> @@ -1950,10 +1950,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
>
> DomainVO domainVO = null;
>
> - if (userId == null) {
> - userId = User.UID_SYSTEM;
> - }
> -
> if (domainId != null) {
> domainVO = _domainDao.findById(domainId);
> }
>
> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/edf1047a/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 deb2424..e089cd1 100755
> --- a/server/src/com/cloud/server/ManagementServerImpl.java
> +++ b/server/src/com/cloud/server/ManagementServerImpl.java
> @@ -1696,9 +1696,6 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
>
> if (scope != null && !scope.isEmpty()) {
> // getting the list of parameters at requested scope
> - if (id == null) {
> - throw new InvalidParameterValueException("Invalid id null, id is needed corresponding to the scope");
> - }
> sc.addAnd("scope", SearchCriteria.Op.EQ, scope);
> }
>
>
--
Daan