From b029353cfc77bfabe376e6a5852d22134d548431 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Mon, 4 Mar 2013 09:23:11 +0000 Subject: [PATCH] Fix exception throw in FileFolderServiceImpl.getNameOnlyPath() to ensure only FileNotFoundException is thrown not RuntimeException to pass unit test. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47484 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/model/filefolder/FileFolderServiceImpl.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java index 4e891db772..f47ca76c4e 100644 --- a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java +++ b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java @@ -1466,6 +1466,15 @@ public class FileFolderServiceImpl implements FileFolderService { throw new FileNotFoundException(nodeRef); } + catch (RuntimeException e) + { + // the runAs() is too keen on wrapping everything in an outer RuntimeException - which we don't want. + if (e.getCause() instanceof FileNotFoundException) + { + throw (FileNotFoundException)e.getCause(); + } + else throw e; + } } public FileInfo resolveNamePath(NodeRef rootNodeRef, List pathElements) throws FileNotFoundException