From f54ab26b88f7aeabb38bd1229e984f80114e62b4 Mon Sep 17 00:00:00 2001
From: Rodica Sutu <rodica.sutu@ness.com>
Date: Mon, 4 Nov 2019 17:42:25 +0200
Subject: [PATCH] fix the case when before and after values are null

---
 .../util/PropertyModificationAllowedCheck.java                 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/PropertyModificationAllowedCheck.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/PropertyModificationAllowedCheck.java
index 49dc26b716..592f704971 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/PropertyModificationAllowedCheck.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/PropertyModificationAllowedCheck.java
@@ -99,7 +99,8 @@ public class PropertyModificationAllowedCheck
                     && !after.get(key).equals(beforeValue);
 
             //check if the property has been emptied or removed
-            boolean propertyRemovedEmptied = after.get(key) == null || !after.containsKey(key);
+            boolean propertyRemovedEmptied = (after.get(key) == null && beforeValue !=null)
+                                                || !after.containsKey(key);
             if (modified || propertyRemovedEmptied)
             {
                 proceed = allowPropertyUpdate(key);