Repository: incubator-stratos Updated Branches: refs/heads/master 418421d2e -> 505dd15aa
code clean for serviceutils getavailablecartridges Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/476682da Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/476682da Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/476682da Branch: refs/heads/master Commit: 476682da03141792f7b1233cb4ae7507e62835f0 Parents: 917bbc6 Author: Udara Liyanage <[email protected]> Authored: Thu Mar 13 10:13:10 2014 -0400 Committer: Udara Liyanage <[email protected]> Committed: Thu Mar 13 10:13:10 2014 -0400 ---------------------------------------------------------------------- .../apache/stratos/rest/endpoint/services/ServiceUtils.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/476682da/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java index 61f8568..3a5ef08 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java @@ -505,13 +505,7 @@ public class ServiceUtils { } static Cartridge getAvailableCartridgeInfo(String cartridgeType, Boolean multiTenant, ConfigurationContext configurationContext) throws RestAPIException { - List<Cartridge> cartridges; - - if(multiTenant != null) { - cartridges = getAvailableCartridges(null, multiTenant, configurationContext); - } else { - cartridges = getAvailableCartridges(null, null, configurationContext); - } + List<Cartridge> cartridges = getAvailableCartridges(null, multiTenant, configurationContext); for(Cartridge cartridge : cartridges) { if(cartridge.getCartridgeType().equals(cartridgeType)) { return cartridge;
