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

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

Browse Source 
104564: Merged DEV to HEAD-BUG-FIX (5.1/Cloud)
      104487 : ACE-3949 : Non-specific message if maximumFileSizeLimit is exceeded
         - Added list of public exceptions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104638 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-05-20 12:05:13 +00:00
parent c70953278a
commit 0bdeee43d1
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/alfresco/web-scripts-application-context.xml
View File

@@ -141,6 +141,11 @@
<value>org.alfresco.service.cmr.repository.ContentIOException</value> <value>org.alfresco.service.cmr.repository.ContentIOException</value>
</list> </list>
</property> </property>
<property name="publicExceptions">
<list>
<value>org.alfresco.repo.content.ContentLimitViolationException</value>
</list>
</property>
</bean> </bean>
<bean id="webscripts.container" class="org.alfresco.repo.web.scripts.TenantRepositoryContainer" parent="baseAlfrescoRepositoryContainer" init-method="setup"> <bean id="webscripts.container" class="org.alfresco.repo.web.scripts.TenantRepositoryContainer" parent="baseAlfrescoRepositoryContainer" init-method="setup">

23
source/java/org/alfresco/repo/web/scripts/RepositoryContainer.java
View File

@@ -91,6 +91,7 @@ public class RepositoryContainer extends AbstractRuntimeContainer
private ThresholdOutputStreamFactory streamFactory = null; private ThresholdOutputStreamFactory streamFactory = null;
private Class<?>[] notPublicExceptions = new Class<?>[] {}; private Class<?>[] notPublicExceptions = new Class<?>[] {};
private Class<?>[] publicExceptions = new Class<?>[] {};
/* /*
* Shame init is already used (by TenantRepositoryContainer). * Shame init is already used (by TenantRepositoryContainer).
@@ -197,6 +198,25 @@ public class RepositoryContainer extends AbstractRuntimeContainer
return notPublicExceptions; return notPublicExceptions;
} }
/**
* Exceptions which may contain information that need to display in UI
*
* @param publicExceptions - {@link Class}&lt;?&gt;[] instance which contains list of public exceptions
*/
public void setPublicExceptions(List<Class<?>> publicExceptions)
{
this.publicExceptions = new Class<?>[] {};
if((null != publicExceptions) && !publicExceptions.isEmpty())
{
this.publicExceptions = publicExceptions.toArray(this.publicExceptions);
}
}
public Class<?>[] getPublicExceptions()
{
return publicExceptions;
}
/* (non-Javadoc) /* (non-Javadoc)
* @see org.alfresco.web.scripts.Container#getDescription() * @see org.alfresco.web.scripts.Container#getDescription()
*/ */
@@ -282,7 +302,8 @@ public class RepositoryContainer extends AbstractRuntimeContainer
catch (RuntimeException e) catch (RuntimeException e)
{ {
Throwable hideCause = ExceptionStackUtil.getCause(e, notPublicExceptions); Throwable hideCause = ExceptionStackUtil.getCause(e, notPublicExceptions);
if (hideCause != null) Throwable displayCause = ExceptionStackUtil.getCause(e, publicExceptions);
if (displayCause == null && hideCause != null)
{ {
AlfrescoRuntimeException alf = null; AlfrescoRuntimeException alf = null;
if (e instanceof AlfrescoRuntimeException) if (e instanceof AlfrescoRuntimeException)