#16376 set null properties map last (#16419)

dotCMS · Apr 17, 2019 · 190aad4 · 190aad4
1 parent ec5c41c
commit 190aad4
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java
@@ -4278,10 +4278,14 @@ public void copyProperties(final Contentlet contentlet, final Map<String, Object
             }
         }
 
+
         for (Map.Entry<String, Object> property : properties.entrySet()) {
             String conVariable = property.getKey();
             Object value = property.getValue();
             try{
+                if(conVariable.equals(Contentlet.NULL_PROPERTIES)) {
+                    continue;
+                }
                 if(conVariable.equals(Contentlet.INODE_KEY)){
                     contentlet.setInode((String)value);
                 }else if(conVariable.equals(Contentlet.LANGUAGEID_KEY)){
@@ -4345,7 +4349,12 @@ public void copyProperties(final Contentlet contentlet, final Map<String, Object
                 Logger.error(this,"IO Error in copying Binary File object ", ioe);
             }
 
+        }
 
+         //if we have a nullProperties variable, it needs to be the last one set
+        if(UtilMethods.isSet(properties.get(Contentlet.NULL_PROPERTIES))) {
+            contentlet.setProperty(Contentlet.NULL_PROPERTIES,
+                    properties.get(Contentlet.NULL_PROPERTIES));
         }
 
         // workflow