From 0fabdd31ec0feb97f2607d7389b40920255ec5c2 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Mon, 26 Nov 2012 10:36:57 +0000
Subject: [PATCH] Fixed merge issue which prevented declaring a file as record.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@43948 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../action/impl/DeclareRecordAction.java      | 27 +++++--------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
index 3f0d89a3d3..b387eee6ef 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
@@ -78,7 +78,7 @@ public class DeclareRecordAction extends RMActionExecuterAbstractBase
 
                // remove all owner related rights 
                this.ownableService.setOwner(actionedUponNodeRef, OwnableService.NO_OWNER);
-            }            
+            }
             else
             {
                logger.debug(buildMissingPropertiesErrorString(missingProperties));
@@ -108,8 +108,8 @@ public class DeclareRecordAction extends RMActionExecuterAbstractBase
    /**
     * Helper method to check whether all the mandatory properties of the node have been set
     * 
-    * @param nodeRef    node reference
-    * @return boolean   true if all mandatory properties are set, false otherwise
+    * @param nodeRef node reference
+    * @return boolean true if all mandatory properties are set, false otherwise
     */
    private boolean mandatoryPropertiesSet(NodeRef nodeRef, List<String> missingProperties)
    {
@@ -162,8 +162,8 @@ public class DeclareRecordAction extends RMActionExecuterAbstractBase
    /**
     * Log information about missing properties.
     * 
-    * @param propDef             property definition
-    * @param missingProperties   missing properties
+    * @param propDef               property definition
+    * @param missingProperties     missing properties
     */
    private void logMissingProperty(PropertyDefinition propDef, List<String> missingProperties)
    {
@@ -203,22 +203,8 @@ public class DeclareRecordAction extends RMActionExecuterAbstractBase
             {
                return true;
             }
-            else
-            {
-               if (throwException)
-               {
-                  throw new AlfrescoRuntimeException(buildMissingPropertiesErrorString(missingProperties));
-               }
-               else
-               {
-                  return false;
-               }
-            }
-         }
-         else
-         {
-            return false;
          }
+         return false;
       }
       else
       {
@@ -232,4 +218,5 @@ public class DeclareRecordAction extends RMActionExecuterAbstractBase
          }
       }
    }
+
 }