1 files changed, 8 insertions, 8 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/EntitlementPoolEntity.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/EntitlementPoolEntity.java
index dce2939ae5..2b7b3a6ded 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/EntitlementPoolEntity.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/EntitlementPoolEntity.java
@@ -258,11 +258,11 @@ public class EntitlementPoolEntity implements VersionableEntity {
         if(obj.getType().equals(LimitType.ServiceProvider)){
           LimitXml xmlObj = new LimitXml();
           xmlObj.setDescription(obj.getDescription());
-          xmlObj.setMetric(obj.getMetric()!=null?obj.getMetric().name():null);
-          xmlObj.setValues(obj.getValue()!=null?Integer.toString(obj.getValue()):null);
-          xmlObj.setUnit(obj.getUnit()!=null?Integer.toString(obj.getUnit()):null);
+          xmlObj.setMetric(obj.getMetric());
+          xmlObj.setValues(obj.getValue());
+          xmlObj.setUnit(obj.getUnit());
           xmlObj.setAggregationFunction(obj.getAggregationFunction()!=null?obj.getAggregationFunction().name():null);
-          xmlObj.setTime(obj.getTime()!=null?obj.getTime().name():null);
+          xmlObj.setTime(obj.getTime());
           hs.add(xmlObj);
         }
       }
@@ -281,11 +281,11 @@ public class EntitlementPoolEntity implements VersionableEntity {
         if(obj.getType().equals(LimitType.Vendor)){
           LimitXml xmlObj = new LimitXml();
           xmlObj.setDescription(obj.getDescription());
-          xmlObj.setMetric(obj.getMetric()!=null?obj.getMetric().name():null);
-          xmlObj.setValues(obj.getValue()!=null?Integer.toString(obj.getValue()):null);
-          xmlObj.setUnit(obj.getUnit()!=null?Integer.toString(obj.getUnit()):null);
+          xmlObj.setMetric(obj.getMetric());
+          xmlObj.setValues(obj.getValue());
+          xmlObj.setUnit(obj.getUnit());
           xmlObj.setAggregationFunction(obj.getAggregationFunction()!=null?obj.getAggregationFunction().name():null);
-          xmlObj.setTime(obj.getTime()!=null?obj.getTime().name():null);
+          xmlObj.setTime(obj.getTime());
           hs.add(xmlObj);
         }
       }