From f7e98b5df2278482841b16daf8646b00cefa59a5 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 8 Jan 2018 08:34:42 +0000 Subject: [PATCH] Simplify inequality check as suggested in code review. --- .../disposition/property/DispositionProperty.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/property/DispositionProperty.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/property/DispositionProperty.java index 880872110f..f7d46294b5 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/property/DispositionProperty.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/property/DispositionProperty.java @@ -32,6 +32,7 @@ import static org.apache.commons.lang3.BooleanUtils.isNotTrue; import java.io.Serializable; import java.util.Date; import java.util.Map; +import java.util.Objects; import java.util.Set; import org.alfresco.error.AlfrescoRuntimeException; @@ -261,8 +262,6 @@ public class DispositionProperty extends BaseBehaviourBean Serializable beforeValue = before.get(propertyName); Serializable afterValue = after.get(propertyName); - return ((beforeValue == null && afterValue != null) - || (beforeValue != null && afterValue == null) - || (beforeValue != null && afterValue != null && !beforeValue.equals(afterValue))); + return !Objects.equals(beforeValue, afterValue); } }