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 2015/05/18 11:37:32 UTC
[4/4] stratos git commit: fixing NULL conversion issue
fixing NULL conversion issue
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f6ef5fff
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f6ef5fff
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f6ef5fff
Branch: refs/heads/master
Commit: f6ef5fff9d603b0f4d4538d009f6e5567182b76a
Parents: 7629f86
Author: reka <rt...@gmail.com>
Authored: Mon May 18 12:31:43 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Mon May 18 14:39:14 2015 +0530
----------------------------------------------------------------------
.../stratos/rest/endpoint/util/converter/ObjectConverter.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f6ef5fff/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index 6f54d94..921bfdc 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -1592,7 +1592,11 @@ public class ObjectConverter {
cartridge.setMultiTenant(cartridgeInfo.getMultiTenant());
cartridge.setDescription(cartridgeInfo.getDescription());
cartridge.setLoadBalancingIPType(cartridgeInfo.getLoadBalancingIPType());
- cartridge.setMetadataKeys(cartridgeInfo.getMetadataKeys());
+
+ if(cartridgeInfo.getMetadataKeys() != null && cartridgeInfo.getMetadataKeys()[0] != null) {
+ cartridge.setMetadataKeys(cartridgeInfo.getMetadataKeys());
+ }
+
cartridge.setTenantPartitions(cartridgeInfo.getTenantPartitions());
//convert persistence