You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2014/01/24 06:39:47 UTC
git commit: fixing STRATOS-374
Updated Branches:
refs/heads/master f46c9d2b6 -> 365cac294
fixing STRATOS-374
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/365cac29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/365cac29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/365cac29
Branch: refs/heads/master
Commit: 365cac294e57407227bae299c8994c87d8fdb579
Parents: f46c9d2
Author: rekathiru <rt...@gmail.com>
Authored: Fri Jan 24 11:10:03 2014 +0530
Committer: rekathiru <rt...@gmail.com>
Committed: Fri Jan 24 11:10:03 2014 +0530
----------------------------------------------------------------------
.../org/apache/stratos/rest/endpoint/services/ServiceUtils.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/365cac29/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 e439e88..1c9add9 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
@@ -668,7 +668,9 @@ public class ServiceUtils {
String lbCartridgeType = lbConfig.getType();
try {
// retrieve lb Cartridge info
- lbCartridgeInfo = cloudControllerServiceClient.getCartridgeInfo(lbCartridgeType);
+ if(lbCartridgeType != null) {
+ lbCartridgeInfo = cloudControllerServiceClient.getCartridgeInfo(lbCartridgeType);
+ }
} catch (Exception e) {
String msg = "Cannot get cartridge info: " + cartridgeType;
log.error(msg, e);