Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv1011
Modified Files:
NodeReferrerTag.java
Log Message:
getNode(boolean)
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
Index: NodeReferrerTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/NodeReferrerTag.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- NodeReferrerTag.java 14 Aug 2008 13:42:18 -0000 1.38
+++ NodeReferrerTag.java 22 Aug 2008 13:05:20 -0000 1.39
@@ -28,7 +28,7 @@
* NodeProviderTag and therefore would be a NodeReferrerTag.
*
* @author Michiel Meeuwissen
- * @version $Id: NodeReferrerTag.java,v 1.38 2008/08/14 13:42:18 michiel Exp $
+ * @version $Id: NodeReferrerTag.java,v 1.39 2008/08/22 13:05:20 michiel Exp $
*/
public abstract class NodeReferrerTag extends CloudReferrerTag {
@@ -88,16 +88,21 @@
private Node node;
+
+ protected Node getNode() throws JspTagException {
+ return getNode(true);
+ }
/**
* Gets the Node variable from the parent NodeProvider.
* @return a org.mmbase.bridge.Node
*/
- protected Node getNode() throws JspTagException {
+ protected Node getNode(boolean exception) throws JspTagException {
if (node == null) {
node = parentNodeId == Attribute.NULL ? getNodeFromPageContext()
: null;
// get the node from a parent element.
if (node == null) {
- node = findNodeProvider().getNodeVar();
+ NodeProvider p = findNodeProvider(exception);
+ node = p == null ? null : p.getNodeVar();
} else {
node = (Node) org.mmbase.util.Casting.unWrap(node);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
