[3/4] git commit: exception when subscribing without persistent volume payload

[udara]

exception when subscribing without persistent volume payload

Conflicts:
        
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/344a43a1
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/344a43a1
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/344a43a1

Branch: refs/heads/master
Commit: 344a43a1e6e846c3823b692b075256f57e455aff
Parents: 546fea6
Author: Udara Liyanage <ud...@wso2.com>
Authored: Mon Jun 2 11:45:29 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Wed Jun 4 23:33:03 2014 +0530

----------------------------------------------------------------------
 .../org/apache/stratos/rest/endpoint/services/ServiceUtils.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/344a43a1/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 cc838c7..f5eaac3 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
@@ -986,8 +986,9 @@ public class ServiceUtils {
         subscriptionData.setServiceGroup(cartridgeInfoBean.getServiceGroup());
 
         PersistenceBean persistenceBean = cartridgeInfoBean.getPersistence();
-        
subscriptionData.setPersistence(PojoConverter.getPersistence(persistenceBean));
-
+        if(persistenceBean != null) {
+            
subscriptionData.setPersistence(PojoConverter.getPersistence(persistenceBean));
+        }
         /*
         if (cartridgeInfoBean.isPersistanceRequired()) {
         if (cartridgeInfoBean.getPersistence() != null) {