You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/05/11 14:12:07 UTC
stratos git commit: Fix issue in not showing multi tenant cartridges
in default cartridge list
Repository: stratos
Updated Branches:
refs/heads/master 617e454a9 -> e7cbd33e8
Fix issue in not showing multi tenant cartridges in default cartridge list
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e7cbd33e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e7cbd33e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e7cbd33e
Branch: refs/heads/master
Commit: e7cbd33e8736e6e44d9df8d16985e37deaf71eeb
Parents: 617e454
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon May 11 17:27:08 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon May 11 17:32:33 2015 +0530
----------------------------------------------------------------------
.../org/apache/stratos/rest/endpoint/api/StratosApiV41.java | 3 ++-
.../apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e7cbd33e/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
index 48a9c2a..b1552c2 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
@@ -320,7 +320,8 @@ public class StratosApiV41 extends AbstractApi {
@AuthorizationAction("/permission/admin/manage/getCartridge")
public Response getCartridges()
throws RestAPIException {
- List<CartridgeBean> cartridges = StratosApiV41Utils.getAvailableCartridges(null, false, getConfigContext());
+
+ List<CartridgeBean> cartridges = StratosApiV41Utils.getAvailableCartridges(null, null, getConfigContext());
if (cartridges == null || cartridges.isEmpty()) {
return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean(
ResponseMessageBean.ERROR, "No cartridges found")).build();
http://git-wip-us.apache.org/repos/asf/stratos/blob/e7cbd33e/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index 293f997..464271a 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -387,7 +387,7 @@ public class StratosApiV41Utils {
}
public static List<CartridgeBean> getAvailableCartridges(
- String cartridgeSearchString, boolean multiTenant, ConfigurationContext configurationContext)
+ String cartridgeSearchString, Boolean multiTenant, ConfigurationContext configurationContext)
throws RestAPIException {
List<CartridgeBean> cartridges = new ArrayList<CartridgeBean>();
@@ -420,10 +420,10 @@ public class StratosApiV41Utils {
continue;
}
- if (!multiTenant && cartridgeInfo.getMultiTenant()) {
+ if (multiTenant != null && !multiTenant && cartridgeInfo.getMultiTenant()) {
// Need only Single-Tenant cartridges
continue;
- } else if (multiTenant && !cartridgeInfo.getMultiTenant()) {
+ } else if ( multiTenant != null && multiTenant && !cartridgeInfo.getMultiTenant()) {
// Need only Multi-Tenant cartridges
continue;
}