From b11acd5737e8ca4c67ef5cd34e92492c6530166c Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 11 Feb 2014 19:11:50 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 57069: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3) 56556: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1) 56044: MNT-9519: Misleading error message about 'mimetype' when content is null * Replaced: MSG_ERR_WORKINGCOPY_HAS_NO_MIMETYPE with MSG_ERR_WORKINGCOPY_HAS_NO_CONTENT, coci_service.err_workingcopy_has_no_mimetype with coci_service.err_workingcopy_has_no_content * Tested via Eclipse Remote Debug git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61700 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/messages/coci-service.properties | 2 +- .../org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/alfresco/messages/coci-service.properties b/config/alfresco/messages/coci-service.properties index 39446bcb69..580aa9d85e 100644 --- a/config/alfresco/messages/coci-service.properties +++ b/config/alfresco/messages/coci-service.properties @@ -5,7 +5,7 @@ coci_service.err_bad_copy=The original node cannot be found. Perhaps the copy h coci_service.err_not_owner=This user is not the owner of the working copy and cannot check it in. coci_service.err_workingcopy_checkout=A working copy cannot be checked out. coci_service.err_not_authenticated=Cannot find the currently authenticated user details required by the CheckOutCheckIn service. -coci_service.err_workingcopy_has_no_mimetype=Working copy node ({0}) has no mimetype +coci_service.err_workingcopy_has_no_content=Working copy node ({0}) has no content coci_service.err_already_checkedout=This node is already checked out. coci_service.err_cannot_rename=Cannot rename from {0} to {1}. coci_service.discussion_for={0} discussion diff --git a/source/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java b/source/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java index 6c685a3d6a..13231c61ac 100644 --- a/source/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java +++ b/source/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java @@ -80,7 +80,7 @@ public class CheckOutCheckInServiceImpl implements CheckOutCheckInService private static final String MSG_ERR_NOT_OWNER = "coci_service.err_not_owner"; private static final String MSG_ERR_ALREADY_WORKING_COPY = "coci_service.err_workingcopy_checkout"; private static final String MSG_ERR_NOT_AUTHENTICATED = "coci_service.err_not_authenticated"; - private static final String MSG_ERR_WORKINGCOPY_HAS_NO_MIMETYPE = "coci_service.err_workingcopy_has_no_mimetype"; + private static final String MSG_ERR_WORKINGCOPY_HAS_NO_CONTENT = "coci_service.err_workingcopy_has_no_content"; private static final String MSG_ALREADY_CHECKEDOUT = "coci_service.err_already_checkedout"; private static final String MSG_ERR_CANNOT_RENAME = "coci_service.err_cannot_rename"; @@ -563,7 +563,7 @@ public class CheckOutCheckInServiceImpl implements CheckOutCheckInService ContentData contentData = (ContentData) nodeService.getProperty(workingCopyNodeRef, ContentModel.PROP_CONTENT); if (contentData == null) { - throw new AlfrescoRuntimeException(MSG_ERR_WORKINGCOPY_HAS_NO_MIMETYPE, new Object[]{workingCopyNodeRef}); + throw new AlfrescoRuntimeException(MSG_ERR_WORKINGCOPY_HAS_NO_CONTENT, new Object[]{workingCopyNodeRef}); } else {