inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
100988: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100831: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100731: MNT-13682 Reverting 100341 which caused a test failure.
         The failure was DocumentDetailsPageTest.addLikeDislike and it failed in
         https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-912/


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101003 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-04-01 01:26:40 +00:00
parent a0874952a2
commit fd90fbf2a7
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/service/cmr/model/FileExistsException.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2015 Alfresco Software Limited.
* Copyright (C) 2005-2010 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -19,19 +19,17 @@
package org.alfresco.service.cmr.model;
import org.alfresco.api.AlfrescoPublicApi;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.service.cmr.repository.NodeRef;
/**
* Common exception thrown when an operation fails because of a name clash.
* Common, checked exception thrown when an operation fails because
* of a name clash.
*
* @author Derek Hulley
*/
@AlfrescoPublicApi
public class FileExistsException extends AlfrescoRuntimeException
public class FileExistsException extends RuntimeException
{
private static final String MESSAGE_ID = "file_folder_service.file_exists_message";
private static final long serialVersionUID = -4133713912784624118L;
private NodeRef parentNodeRef;
@@ -39,7 +37,9 @@ public class FileExistsException extends AlfrescoRuntimeException
public FileExistsException(NodeRef parentNodeRef, String name)
{
super(MESSAGE_ID, new Object[] { name });
super("Existing file or folder " +
name +
" already exists");
this.parentNodeRef = parentNodeRef;
this.name = name;
}