[MMBASE CVS] src/org/mmbase/module/builders AbstractServletBuilder.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/module/builders
In directory james.mmbase.org:/tmp/cvs-serv5870

Modified Files:
        AbstractServletBuilder.java 
Log Message:
'url' function (~ servletpath, but with less arguments) was not quite correct 


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/builders


Index: AbstractServletBuilder.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/builders/AbstractServletBuilder.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- AbstractServletBuilder.java 18 Sep 2008 10:24:35 -0000      1.56
+++ AbstractServletBuilder.java 18 Sep 2008 10:41:24 -0000      1.57
@@ -30,7 +30,7 @@
  *
  *
  * @author Michiel Meeuwissen
- * @version $Id: AbstractServletBuilder.java,v 1.56 2008/09/18 10:24:35 
michiel Exp $
+ * @version $Id: AbstractServletBuilder.java,v 1.57 2008/09/18 10:41:24 
michiel Exp $
  * @since   MMBase-1.6
  */
 public abstract class AbstractServletBuilder extends MMObjectBuilder {
@@ -477,7 +477,7 @@
                             return servlet;
                         }
 
-                        public String getFunctionValue(Node node, Parameters 
a) {
+                        @Override public String getFunctionValue(Node node, 
Parameters a) {
                             // verify if the object is stored externally (in 
which case
                             // its url has been filled in)
                             // if so, return the url of the external source
@@ -524,14 +524,17 @@
 
                         }
 
-                        public String getFunctionValue(Parameters a) {
+                        @Override public String getFunctionValue(Parameters a) 
{
                             return getServletPath(a).toString();
                         }
                     });
 
         addFunction(new NodeFunction<String>("url", new Parameter[] { 
Parameter.REQUEST, Parameter.CLOUD }) {
-                public String getFunctionValue(Node node, Parameters a) {
-                    return  node.getFunctionValue("servletpath", a).toString();
+                @Override public String getFunctionValue(Node node, Parameters 
a) {
+                    Function spFunction = node.getFunction("servletpath");
+                    Parameters p = spFunction.createParameters();
+                    p.setAll(a);
+                    return  node.getFunctionValue("servletpath", p).toString();
                 }
             });
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs