From f26ba2f1b883c5b2a960b0ea08437ac2b4a414cf Mon Sep 17 00:00:00 2001
From: Barzilai Spinak <barspi@transactility.com>
Date: Fri, 10 Feb 2023 03:53:33 -0300
Subject: [PATCH] TagsConverter: correctly handle null values

---
 .../main/java/org/jpos/ee/converter/TagsConverter.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/dbsupport/src/main/java/org/jpos/ee/converter/TagsConverter.java b/modules/dbsupport/src/main/java/org/jpos/ee/converter/TagsConverter.java
index 5c39a4f948..76529296aa 100644
--- a/modules/dbsupport/src/main/java/org/jpos/ee/converter/TagsConverter.java
+++ b/modules/dbsupport/src/main/java/org/jpos/ee/converter/TagsConverter.java
@@ -26,11 +26,15 @@
 public class TagsConverter implements AttributeConverter<Tags,String> {
     @Override
     public String convertToDatabaseColumn(Tags tags) {
-        return tags != null && tags.size() > 0 ? tags.toString() : "";
+        return  tags == null ?
+                null :
+                tags.size() > 0 ? tags.toString() : "";
     }
 
     @Override
     public Tags convertToEntityAttribute(String dbData) {
-        return new Tags(dbData);
+        return  dbData != null ?
+                new Tags(dbData) :
+                null;
     }
 }