[Geotools-commits] svn - r36213 - trunk/modules/library/main/src/main/java/org/geotools/filter/function

[<svn...@os...>]

Author: jdeolive
Date: 2010-09-19 00:45:48 +0000 (Sun, 19 Sep 2010)
New Revision: 36213

Modified:
   trunk/modules/library/main/src/main/java/org/geotools/filter/function/DefaultFunctionFactory.java
Log:
GEOT-3264, properly reporting number of function arguments for functions that implement FunctionExpression

Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/DefaultFunctionFactory.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/DefaultFunctionFactory.java	2010-09-17 20:52:32 UTC (rev 36212)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/DefaultFunctionFactory.java	2010-09-19 00:45:48 UTC (rev 36213)
@@ -112,10 +112,11 @@
         functions = CommonFactoryFinder.getFunctions(null);
         for (Iterator i = functions.iterator(); i.hasNext();) {
             Function function = (Function) i.next();
+            int argc = function instanceof FunctionExpression ? 
+                ((FunctionExpression)function).getArgCount() : function.getParameters().size();
             
             FunctionDescriptor fd = new FunctionDescriptor(
-                filterFactory.functionName(function.getName(), function.getParameters().size()), 
-                function.getClass());
+                filterFactory.functionName(function.getName(), argc), function.getClass());
             functionCache.put(functionName(function.getName()), fd);
         }
     }