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

Improvements to the exception message (was null ptr) thrown when a developer makes a mistake in the Advanced Search custom attributes config

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast 2006-01-17 17:15:01 +00:00
parent 4732ebc744
commit b2770cd90a
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/web/ui/repo/component/UISearchCustomProperties.java
View File

@ -31,6 +31,7 @@ import javax.faces.context.ResponseWriter;
import javax.faces.el.ValueBinding; import javax.faces.el.ValueBinding;
import org.alfresco.config.ConfigService; import org.alfresco.config.ConfigService;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.service.cmr.dictionary.AspectDefinition; import org.alfresco.service.cmr.dictionary.AspectDefinition;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryException; import org.alfresco.service.cmr.dictionary.DictionaryException;
@ -154,12 +155,20 @@ public class UISearchCustomProperties extends SelfRenderingComponent implements
{ {
QName type = Repository.resolveToQName(property.Type); QName type = Repository.resolveToQName(property.Type);
TypeDefinition typeDef = dd.getType(type); TypeDefinition typeDef = dd.getType(type);
if (typeDef == null)
{
throw new AlfrescoRuntimeException("No Type Definition found for: " + property.Type + " - Was an Aspect expected?");
}
propDef = typeDef.getProperties().get(Repository.resolveToQName(property.Property)); propDef = typeDef.getProperties().get(Repository.resolveToQName(property.Property));
} }
else if (property.Aspect != null) else if (property.Aspect != null)
{ {
QName aspect = Repository.resolveToQName(property.Aspect); QName aspect = Repository.resolveToQName(property.Aspect);
AspectDefinition aspectDef = dd.getAspect(aspect); AspectDefinition aspectDef = dd.getAspect(aspect);
if (aspectDef == null)
{
throw new AlfrescoRuntimeException("No Aspect Definition found for: " + property.Aspect + " - Was a Type expected?");
}
propDef = aspectDef.getProperties().get(Repository.resolveToQName(property.Property)); propDef = aspectDef.getProperties().get(Repository.resolveToQName(property.Property));
} }