From f4655ad4024fbab9c9f997e57df884c4ead9ac2d Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Wed, 30 Sep 2015 14:32:11 +0000
Subject: [PATCH] RM-2477 (The downgrade instructions are not required when
 only one of the Downgrade date or event is completed)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@113480 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../model/clf/aspect/ClassifiedAspect.java    | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspect.java
index 622e345eb3..de13b25b65 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspect.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspect.java
@@ -19,14 +19,20 @@
 package org.alfresco.module.org_alfresco_module_rm.model.clf.aspect;
 
 import static org.alfresco.module.org_alfresco_module_rm.util.RMCollectionUtils.diffKey;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationException.MissingDowngradeInstructions;
 import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationLevel;
 import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationSchemeService;
 import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationSchemeService.Reclassification;
 import org.alfresco.module.org_alfresco_module_rm.classification.model.ClassifiedContentModel;
-import org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferralAdminService;
 import org.alfresco.module.org_alfresco_module_rm.model.BaseBehaviourBean;
+import org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferralAdminService;
 import org.alfresco.module.org_alfresco_module_rm.util.RMCollectionUtils.Difference;
 import org.alfresco.repo.node.NodeServicePolicies;
 import org.alfresco.repo.policy.Behaviour.NotificationFrequency;
@@ -40,11 +46,6 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 /**
  * clf:classification behaviour bean
  *
@@ -219,6 +220,17 @@ public class ClassifiedAspect extends BaseBehaviourBean implements NodeServicePo
      */
     private boolean isEmpty(Serializable value)
     {
-        return (value == null || value.equals(""));
+        boolean isEmpty;
+
+        if (value instanceof String)
+        {
+            isEmpty = isBlank((String) value);
+        }
+        else
+        {
+            isEmpty = (value == null || value.equals(""));
+        }
+
+        return isEmpty;
     }
 }