Merged V3.2 to HEAD

17075: Merged DEV-TEMPORARY to V3.2
      16768: ETHREEOH-2359: System Error message appears while clicking "View Completed Task" icon for the task, if the user, whom the Adhoc task was assigned to, has been deleted
      16792: *RECORD ONLY* ETHREEOH-1429: Unfriendly error occurs when two content managers create identical content items in appropriate user sandboxes
   17078: Merged DEV-TEMPORARY to V3.2
      16962: ETHREEOH-1289: It is possible to add one Web Form to Web Project twice and more times
   17080: Merged DEV-TEMPORARY to V3.2
      16960: ETHREEOH-1894: Unfriendly notifications appear when trying to edit unlocked content

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17081 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-10-22 10:17:12 +00:00
parent 46dee0999d
commit f62a7a886a

View File

@@ -201,7 +201,7 @@ public class CheckOutCheckInServiceImpl implements CheckOutCheckInService
QName destinationAssocQName) QName destinationAssocQName)
{ {
LockType lockType = this.lockService.getLockType(nodeRef); LockType lockType = this.lockService.getLockType(nodeRef);
if (LockType.READ_ONLY_LOCK.equals(lockType) == true) if (LockType.READ_ONLY_LOCK.equals(lockType) == true || getWorkingCopy(nodeRef) != null)
{ {
throw new CheckOutCheckInServiceException(MSG_ALREADY_CHECKEDOUT); throw new CheckOutCheckInServiceException(MSG_ALREADY_CHECKEDOUT);
} }