1 files changed, 7 insertions, 0 deletions
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/HtDatabaseEventsService.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/HtDatabaseEventsService.java
index 3f7e30c22..4a4b332d6 100644
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/HtDatabaseEventsService.java
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/HtDatabaseEventsService.java
@@ -256,6 +256,13 @@ public class HtDatabaseEventsService implements ArchiveCleanProvider, DataProvid
         if (assertIfClientNullForNodeName(internalEquipment.getNodeId())) {
             return;
         }
+        if(internalEquipment.getManufacturerIdentifier()==null) {
+        	internalEquipment = new InventoryBuilder(internalEquipment).setManufacturerIdentifier("").build();
+        }
+        if(internalEquipment.getDate()==null) {
+        	internalEquipment = new InventoryBuilder(internalEquipment).setDate("").build();
+        }
+        
         eventRWEquipment.write(internalEquipment, internalEquipment.getNodeId()+"/"+internalEquipment.getUuid());
     }