[cvs] Expresso commit by lhamel: protect against case where container is

JCorporate Ltd jcorp at jcorp2.servlets.net
Thu Oct 7 17:45:16 PDT 2004


Log Message:
-----------
protect against case where container is block tag, but has null block from getBlock()

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib:
        TransitionParamsTag.java

Revision Data
-------------
Index: TransitionParamsTag.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/TransitionParamsTag.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/TransitionParamsTag.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/TransitionParamsTag.java -u -r1.11 -r1.12
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/TransitionParamsTag.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/TransitionParamsTag.java
@@ -115,8 +115,10 @@
                     oneTransition = (Transition) ((ElementIterator) container).getElement();
                     nameToUse = oneTransition.getName();
                 } else if (container instanceof BlockTag) {
-                    oneTransition = (Transition) ((BlockTag) container).getBlock().getContent(
+                    if ( ((BlockTag) container).getBlock() != null ) {
+                        oneTransition = (Transition) ((BlockTag) container).getBlock().getContent(
                             getName());
+                    }
                 } else {
                     throw new JspTagException(
                             "TransitionParamsTag: cannot handle container tag" +


More information about the cvs mailing list