Update of
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/functions
In directory james.mmbase.org:/tmp/cvs-serv4739
Modified Files:
Tag: MMBase-1_8
AbstractFunctionTag.java
Log Message:
MMB-1578
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/functions
See also: http://www.mmbase.org/jira/browse/MMB-1578
Index: AbstractFunctionTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/functions/AbstractFunctionTag.java,v
retrieving revision 1.27.2.2
retrieving revision 1.27.2.3
diff -u -b -r1.27.2.2 -r1.27.2.3
--- AbstractFunctionTag.java 17 Nov 2006 13:08:10 -0000 1.27.2.2
+++ AbstractFunctionTag.java 24 Jan 2008 12:06:54 -0000 1.27.2.3
@@ -16,6 +16,7 @@
import javax.servlet.jsp.JspTagException;
import org.mmbase.bridge.NotFoundException;
+import org.mmbase.bridge.Node;
import org.mmbase.bridge.jsp.taglib.*;
import org.mmbase.bridge.jsp.taglib.containers.*;
import org.mmbase.bridge.jsp.taglib.util.*;
@@ -36,7 +37,7 @@
*
* @author Michiel Meeuwissen
* @since MMBase-1.7
- * @version $Id: AbstractFunctionTag.java,v 1.27.2.2 2006/11/17 13:08:10
nklasens Exp $
+ * @version $Id: AbstractFunctionTag.java,v 1.27.2.3 2008/01/24 12:06:54
michiel Exp $
*/
abstract public class AbstractFunctionTag extends NodeReferrerTag {
@@ -175,7 +176,12 @@
return ((FunctionContainerTag)
functionOrNode).getFunction(functionName);
}
} else {
+ Node node = getNodeFromPageContext();
+ if (node == null) {
return null;
+ } else {
+ return node.getFunction(functionName);
+ }
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
