Merged 1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4316 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4317 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4319 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4328 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4652 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-19 12:18:46 +00:00
parent 399fbc81cf
commit d9ac93d909

View File

@@ -29,8 +29,6 @@ import javax.xml.parsers.ParserConfigurationException;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.permissions.AccessDeniedException;
import org.alfresco.repo.transaction.TransactionUtil;
import org.alfresco.repo.transaction.TransactionUtil.TransactionWork;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.lock.LockService;
import org.alfresco.service.cmr.model.FileFolderService;
@@ -139,10 +137,13 @@ public abstract class WebDAVMethod
}
catch (Throwable e)
{
Throwable cause = e.getCause();
if (cause instanceof WebDAVServerException)
if (e instanceof WebDAVServerException)
{
throw (WebDAVServerException) cause;
throw (WebDAVServerException) e;
}
else if (e.getCause() instanceof WebDAVServerException)
{
throw (WebDAVServerException) e.getCause();
}
else
{