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/14 09:12:13 UTC
stratos git commit: Fixing removing the cartridge issue in nested
groups
Repository: stratos
Updated Branches:
refs/heads/master 977bf9404 -> 60bdd2fa8
Fixing removing the cartridge issue in nested groups
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/60bdd2fa
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/60bdd2fa
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/60bdd2fa
Branch: refs/heads/master
Commit: 60bdd2fa82d969ad041015621094bdf9f2164824
Parents: 977bf94
Author: anuruddhal <an...@gmail.com>
Authored: Thu May 14 12:19:36 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Thu May 14 12:31:07 2015 +0530
----------------------------------------------------------------------
.../org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/60bdd2fa/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 c139815..9cf8b33 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
@@ -1213,7 +1213,7 @@ public class StratosApiV41Utils {
if (serviceGroup.getCartridges() != null) {
for (String cartridge : serviceGroup.getCartridges()) {
- if (!cartridges.contains(cartridge)) {
+ if (!cartridges.contains(cartridge) & cartridge !=null) {
cartridges.add(cartridge);
}
}