inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
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
This commit is contained in:
Alan Davis
2014-02-11 19:11:50 +00:00
parent 49a7bf551e
commit b11acd5737
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/messages/coci-service.properties
View File

@@ -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

4
source/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java
View File

@@ -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
{