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
This commit is contained in:
Tuna Aksoy
2012-11-26 10:36:57 +00:00
parent c4fb7ac119
commit 0fabdd31ec

View File

@@ -203,23 +203,9 @@ public class DeclareRecordAction extends RMActionExecuterAbstractBase
{
return true;
}
else
{
if (throwException)
{
throw new AlfrescoRuntimeException(buildMissingPropertiesErrorString(missingProperties));
}
else
{
return false;
}
}
}
else
{
return false;
}
}
else
{
if (throwException)
@@ -232,4 +218,5 @@ public class DeclareRecordAction extends RMActionExecuterAbstractBase
}
}
}
}