[MMBASE SCM] r39804 - mmbase/trunk/core/src/main/java/org/mmbase/module/core

[michiel]

Author: michiel
Date: 2009-11-19 15:39:36 +0100 (Thu, 19 Nov 2009)
New Revision: 39804

Modified:
   
mmbase/trunk/core/src/main/java/org/mmbase/module/core/MMObjectNodeFunction.java
Log:
we should call getFunctionValue(NOde, Parameters), because it's not garanteded 
that getFunctionValue(parmaeters) gives the same (it doesn't for 'servletpath' 
e.g.)

Modified: 
mmbase/trunk/core/src/main/java/org/mmbase/module/core/MMObjectNodeFunction.java
===================================================================
--- 
mmbase/trunk/core/src/main/java/org/mmbase/module/core/MMObjectNodeFunction.java
    2009-11-19 14:38:44 UTC (rev 39803)
+++ 
mmbase/trunk/core/src/main/java/org/mmbase/module/core/MMObjectNodeFunction.java
    2009-11-19 14:39:36 UTC (rev 39804)
@@ -132,6 +132,9 @@
      */
     protected final R getFunctionValue(final MMObjectNode coreNode, final 
Parameters parameters) {
         Node node = getNode(coreNode, parameters);
+        if (log.isDebugEnabled()) {
+            log.debug("Now calling on " + this + " " + parameters);
+        }
         return getFunctionValue(node, parameters);
     }
 
@@ -177,7 +180,10 @@
                 return ((MMObjectNodeFunction<Q>) 
wrappedFunction).getFunctionValue(node, parameters);
             } else {
                 Node n = MMObjectNodeFunction.getNode(node, parameters);
-                return ((NodeFunction<Q>) 
wrappedFunction).getFunctionValue(parameters);
+                if (log.isDebugEnabled()) {
+                    log.debug("Now calling on " + wrappedFunction.getClass() + 
" " + wrappedFunction + " " + parameters);
+                }
+                return ((NodeFunction<Q>) 
wrappedFunction).getFunctionValueForNode(n, parameters);
             }
 
         }

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs