Repository: stratos Updated Branches: refs/heads/master 65078b813 -> c0e15684b
Fixed merge conflicts on BasicPayloadData Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c0e15684 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c0e15684 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c0e15684 Branch: refs/heads/master Commit: c0e15684baad8d9d75b21b16f91919870bc93e6e Parents: 65078b8 Author: Chamila de Alwis <[email protected]> Authored: Wed Jan 21 11:14:21 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Wed Jan 28 21:28:47 2015 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/applications/payload/BasicPayloadData.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/c0e15684/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java index 9f2a20f..a146148 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java @@ -19,6 +19,7 @@ package org.apache.stratos.autoscaler.applications.payload; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.util.AutoscalerConstants; @@ -85,7 +86,7 @@ public class BasicPayloadData implements Serializable { payloadBuilder.append("CARTRIDGE_KEY=" + getSubscriptionKey()); payloadBuilder.append(","); payloadBuilder.append("DEPLOYMENT=" + AutoscalerConstants.PAYLOAD_DEPLOYMENT); - if (getApplicationPath() != null) { + if (StringUtils.isNotEmpty(getApplicationPath())) { payloadBuilder.append(","); payloadBuilder.append("APPLICATION_PATH=" + getApplicationPath()); }
