git commit: change json to persistence

[udara]

Repository: stratos
Updated Branches:
  refs/heads/master 669c9026b -> ca95c6d3a


change json to persistence

Conflicts:
        
components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java
        
components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ca95c6d3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ca95c6d3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ca95c6d3

Branch: refs/heads/master
Commit: ca95c6d3a4346c154de536c8c6d07307b10b44b1
Parents: 669c902
Author: Udara Liyanage <ud...@wso2.com>
Authored: Thu May 22 16:55:07 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Wed Jun 4 23:21:06 2014 +0530

----------------------------------------------------------------------
 .../org/apache/stratos/rest/endpoint/services/ServiceUtils.java     | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/ca95c6d3/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 73c37ed..cc838c7 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
@@ -990,6 +990,7 @@ public class ServiceUtils {
 
         /*
         if (cartridgeInfoBean.isPersistanceRequired()) {
+        if (cartridgeInfoBean.getPersistence() != null) {
             // Add persistence related properties to PersistenceContext
             PersistenceContext persistenceContext = new PersistenceContext();
             
persistenceContext.setPersistanceRequiredProperty(IS_VOLUME_REQUIRED, 
String.valueOf(cartridgeInfoBean.isPersistanceRequired()));