[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-serv5520

Modified Files:
        AbstractServletBuilder.java 
Log Message:
url function should not again add file name


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.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- AbstractServletBuilder.java 7 Sep 2008 10:03:55 -0000       1.55
+++ AbstractServletBuilder.java 18 Sep 2008 10:24:35 -0000      1.56
@@ -30,7 +30,7 @@
  *
  *
  * @author Michiel Meeuwissen
- * @version $Id: AbstractServletBuilder.java,v 1.55 2008/09/07 10:03:55 
michiel Exp $
+ * @version $Id: AbstractServletBuilder.java,v 1.56 2008/09/18 10:24:35 
michiel Exp $
  * @since   MMBase-1.6
  */
 public abstract class AbstractServletBuilder extends MMObjectBuilder {
@@ -515,13 +515,13 @@
                                 servlet.append("session=" + session + "+");
                             }
 
-                            if (! addFileName) {
-                                return servlet.append(argument).toString();
-                            } else {
-                                servlet.append(argument).append('/');
+                            servlet.append(argument);
+                            if (addFileName) {
+                                servlet.append('/');
                                 getFileName(mmnode, servlet);
-                                return servlet.toString();
                             }
+                            return servlet.toString();
+
                         }
 
                         public String getFunctionValue(Parameters a) {
@@ -531,16 +531,7 @@
 
         addFunction(new NodeFunction<String>("url", new Parameter[] { 
Parameter.REQUEST, Parameter.CLOUD }) {
                 public String getFunctionValue(Node node, Parameters a) {
-                    String sp = node.getFunctionValue("servletpath", 
a).toString();
-                    MMObjectNode mmnode = node.getNumber() > 0 ?
-                        AbstractServletBuilder.this.getNode(node.getNumber()) :
-                        new MMObjectNode(AbstractServletBuilder.this, new 
org.mmbase.bridge.util.NodeMap(node));
-                    if(addFileName(mmnode, sp)) {
-                        StringBuilder buf = new StringBuilder(sp);
-                        buf.append('/');
-                        sp = getFileName(mmnode, buf).toString();
-                    }
-                    return sp;
+                    return  node.getFunctionValue("servletpath", a).toString();
                 }
             });
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs