Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv13842
Modified Files:
MMObjectBuilder.java
Log Message:
should of course use function value if it was not null
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/core
Index: MMObjectBuilder.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/core/MMObjectBuilder.java,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -b -r1.432 -r1.433
--- MMObjectBuilder.java 22 Sep 2008 17:18:29 -0000 1.432
+++ MMObjectBuilder.java 23 Sep 2008 04:12:08 -0000 1.433
@@ -62,7 +62,7 @@
* @author Rob van Maris
* @author Michiel Meeuwissen
* @author Ernst Bunders
- * @version $Id: MMObjectBuilder.java,v 1.432 2008/09/22 17:18:29 michiel Exp $
+ * @version $Id: MMObjectBuilder.java,v 1.433 2008/09/23 04:12:08 michiel Exp $
*/
public class MMObjectBuilder extends MMTable implements NodeEventListener,
RelationEventListener {
@@ -1659,10 +1659,10 @@
* @return List of function parameters (may be functions themselves).
* @deprecated use executeFunction(node, function, list)
*/
- protected Vector<String> getFunctionParameters(String fields) {
+ protected List<String> getFunctionParameters(String fields) {
int commapos = 0;
int nested = 0;
- Vector<String> v = new Vector<String>();
+ List<String> v = new ArrayList<String>();
int i;
if (log.isDebugEnabled()) log.debug("Fields=" + fields);
for(i = 0; i<fields.length(); i++) {
@@ -1722,7 +1722,7 @@
if (fv == null && MMBase.getMMBase().inDevelopment()) {
throw new IllegalArgumentException("You cannot use
non-existing function '" + functionName + "' of node '" + getNumber() + "'");
} else {
- return null;
+ return fv;
}
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
