Author: ktlili
Date: Tue May 29 16:20:24 2007
New Revision: 17399
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17399&repname=
=3Djahia
Log:
- fix npe exception when there is no description (select portlet engine, NO=
JIRA, only SP)
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field_displayTag.inc
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/application_field_displayTag.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/application_field_displayT=
ag.inc&rev=3D17399&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field_displayTag.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field_displayTag.inc Tue May 29 16:20:24 2007
@@ -71,10 +71,25 @@
Iterator epDefIter =3D appBean.getEntryPointDefinitions().iterator=
();
while (epDefIter.hasNext()) {
EntryPointDefinition entryPointDef =3D (EntryPointDefinition)
epD=
efIter.next();
- String name =3D entryPointDef.getName().toLowerCase();
- String desc =3D appBean.getdesc().toLowerCase();
- String ctx =3D appBean.getName().toLowerCase();
- //no search
+ String name =3D entryPointDef.getName();
+ if(name !=3D null){
+ name =3D entryPointDef.getName().toLowerCase();
+ }else{
+ name =3D "";
+ }
+ String desc =3D appBean.getdesc();
+ if(desc !=3D null){
+ desc =3D appBean.getdesc().toLowerCase();
+ } else {
+ desc =3D "";
+ }
+ String ctx =3D appBean.getName();
+ if(ctx !=3D null){
+ ctx =3D appBean.getName().toLowerCase();
+ } else{
+ ctx =3D "";
+ }
+ //no search
if(portletSearchValue =3D=3D null
||portletSearchValue.equals("")=
){
resultRows.add(entryPointDef);
appPropsMap.put(""+entryPointDef.getApplicationID(),appBean);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
