fixed averageSeries function

EinsamHauer · Sep 29, 2015 · 92d4704 · 92d4704
1 parent 86bb934
commit 92d4704
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/main/java/net/iponweb/disthene/reader/graphite/functions/AverageSeriesFunction.java b/src/main/java/net/iponweb/disthene/reader/graphite/functions/AverageSeriesFunction.java
@@ -27,7 +27,9 @@ public AverageSeriesFunction(String text) {
     @Override
     public List<TimeSeries> evaluate(TargetEvaluator evaluator) throws EvaluationException {
         List<TimeSeries> processedArguments = new ArrayList<>();
-        processedArguments.addAll(evaluator.eval((Target) arguments.get(0)));
+        for (Object argument : arguments) {
+            processedArguments.addAll(evaluator.eval((Target) argument));
+        }
 
         if (processedArguments.size() == 0) return new ArrayList<>();
 
@@ -60,7 +62,11 @@ public List<TimeSeries> evaluate(TargetEvaluator evaluator) throws EvaluationExc
 
     @Override
     public void checkArguments() throws InvalidArgumentException {
-        if (arguments.size() > 1 || arguments.size() == 0) throw new InvalidArgumentException("averageSeries: number of arguments is " + arguments.size() + ". Must be one.");
-        if (!(arguments.get(0) instanceof Target)) throw new InvalidArgumentException("averageSeries: argument is " + arguments.get(0).getClass().getName() + ". Must be series");
+        if (arguments.size() == 0) throw new InvalidArgumentException("averageSeries: number of arguments is " + arguments.size() + ". Must be at least one.");
+
+        for (int i = 0; i < arguments.size() - 1; i++) {
+            if (!(arguments.get(i) instanceof Target))
+                throw new InvalidArgumentException("averageSeries: argument is " + arguments.get(i).getClass().getName() + ". Must be series");
+        }
     }
 }