From c19b9ba9e25eeb14e526f191645e8e97a2ed156e Mon Sep 17 00:00:00 2001
From: Josefina Revilla <josefinarevilla@gmail.com>
Date: Tue, 3 May 2016 17:54:37 -0300
Subject: [PATCH] Validate not null in TagsType replace

---
 .../src/main/java/org/jpos/ee/usertype/TagsType.java          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/dbsupport/src/main/java/org/jpos/ee/usertype/TagsType.java b/modules/dbsupport/src/main/java/org/jpos/ee/usertype/TagsType.java
index b1d6bc5650..7c95584b32 100644
--- a/modules/dbsupport/src/main/java/org/jpos/ee/usertype/TagsType.java
+++ b/modules/dbsupport/src/main/java/org/jpos/ee/usertype/TagsType.java
@@ -95,7 +95,9 @@ public Object assemble(Serializable cached, Object owner) throws HibernateExcept
 
     @Override
     public Object replace(Object original, Object target, Object owner) throws HibernateException {
-        return new Tags(original.toString());
+        if (original != null)
+            return new Tags(original.toString());
+        return null;
     }
 }