Repository: stratos Updated Branches: refs/heads/master dfe8fab2e -> 5523cdb65
Handling NULL object passed to thrift layer. Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5523cdb6 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5523cdb6 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5523cdb6 Branch: refs/heads/master Commit: 5523cdb65f136b8b54cc74217b79e67a9e861082 Parents: dfe8fab Author: Nirmal Fernando <[email protected]> Authored: Sun Oct 12 13:10:06 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Sun Oct 12 13:10:06 2014 +0530 ---------------------------------------------------------------------- .../CartridgeInstanceDataPublisher.java | 26 +++++++++++++------- .../CartridgeSubscriptionDataPublisher.java | 25 ++++++++++++------- 2 files changed, 33 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5523cdb6/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/publisher/CartridgeInstanceDataPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/publisher/CartridgeInstanceDataPublisher.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/publisher/CartridgeInstanceDataPublisher.java index bbc277e..ad3c26f 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/publisher/CartridgeInstanceDataPublisher.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/publisher/CartridgeInstanceDataPublisher.java @@ -84,16 +84,16 @@ public class CartridgeInstanceDataPublisher { payload.add(memberId); payload.add(serviceName); payload.add(clusterId); - payload.add(memberContext.getLbClusterId()); - payload.add(partitionId); - payload.add(networkId); + payload.add(handleNull(memberContext.getLbClusterId())); + payload.add(handleNull(partitionId)); + payload.add(handleNull(networkId)); if (cartridge != null) { - payload.add(String.valueOf(cartridge.isMultiTenant())); + payload.add(handleNull(String.valueOf(cartridge.isMultiTenant()))); } else { payload.add(""); } - payload.add(memberContext.getPartition().getProvider()); - payload.add(status); + payload.add(handleNull(memberContext.getPartition().getProvider())); + payload.add(handleNull(status)); if(metadata != null) { payload.add(metadata.getHostname()); @@ -117,9 +117,9 @@ public class CartridgeInstanceDataPublisher { payload.add(""); } - payload.add(memberContext.getPrivateIpAddress()); - payload.add(memberContext.getPublicIpAddress()); - payload.add(memberContext.getAllocatedIpAddress()); + payload.add(handleNull(memberContext.getPrivateIpAddress())); + payload.add(handleNull(memberContext.getPublicIpAddress())); + payload.add(handleNull(memberContext.getAllocatedIpAddress())); Event event = new Event(); event.setPayloadData(payload.toArray()); @@ -202,4 +202,12 @@ public class CartridgeInstanceDataPublisher { } } + private static String handleNull(String val) { + if (val == null) { + return ""; + } + return val; + } + + } http://git-wip-us.apache.org/repos/asf/stratos/blob/5523cdb6/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/CartridgeSubscriptionDataPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/CartridgeSubscriptionDataPublisher.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/CartridgeSubscriptionDataPublisher.java index 83fff6a..b851d7a 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/CartridgeSubscriptionDataPublisher.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/CartridgeSubscriptionDataPublisher.java @@ -77,17 +77,17 @@ public class CartridgeSubscriptionDataPublisher { // Payload values payload.add(String.valueOf(tenantID)); - payload.add(adminUser); - payload.add(cartridgeAlias); + payload.add(handleNull(adminUser)); + payload.add(handleNull(cartridgeAlias)); payload.add(cartridgeType); - payload.add(repositoryUrl); - payload.add(String.valueOf(isMultiTenant)); - payload.add(autoScalingPolicy); - payload.add(deploymentPolicy); + payload.add(handleNull(repositoryUrl)); + payload.add(handleNull(String.valueOf(isMultiTenant))); + payload.add(handleNull(autoScalingPolicy)); + payload.add(handleNull(deploymentPolicy)); payload.add(String.valueOf(clusterID)); - payload.add(hostName); - payload.add(mappedDomain); - payload.add(action); + payload.add(handleNull(hostName)); + payload.add(handleNull(mappedDomain)); + payload.add(handleNull(action)); Event event = new Event(); event.setPayloadData(payload.toArray()); @@ -165,5 +165,12 @@ public class CartridgeSubscriptionDataPublisher { throw new ADCException(msg, e); } } + + private static String handleNull(String val) { + if (val == null) { + return ""; + } + return val; + } }
