svn commit: [jahia] r19045 - /branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/container/ContainerListTag.java

[xlawrence]

Author: xlawrence
Date: Mon Nov  5 16:18:41 2007
New Revision: 19045

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19045&repname=
=3Djahia
Log:
avoid NPE if containerList cannot be found

Modified:
    branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/conta=
iner/ContainerListTag.java

Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/container/ContainerListTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/container/ContainerListTag.jav=
a&rev=3D19045&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/conta=
iner/ContainerListTag.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/conta=
iner/ContainerListTag.java Mon Nov  5 16:18:41 2007
@@ -270,6 +270,10 @@
                 // list.
                 try {
                     this.containerList =3D getContainerList(jData, getName=
());
+                    if (this.containerList =3D=3D null) {
+                        logger.error("ContainerList is null: " + getName()=
);
+                        return SKIP_BODY;
+                    }
                     JahiaContainerListPagination pagination =3D this.conta=
inerList.getCtnListPagination(false);
                     if ( (pagination =3D=3D null || !pagination.isValid() =
|| pagination.getWindowSize()
                             !=3D this.intWindowSize ) ){

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list