# HG changeset patch # User Andre Heinecke # Date 1369414415 -7200 # Node ID 6e99ce50586082577c00612f82a859b3ec029853 # Parent 0f3ca851d204ecff0a8b05068f4d7488806466e1# Parent 4b634935a2adcea923a4ea30db546de3dffcb423 Merge double fix for Virtual Columns diff -r 0f3ca851d204 -r 6e99ce505860 artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/Builder.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/Builder.java Fri May 24 18:53:05 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/Builder.java Fri May 24 18:53:35 2013 +0200 @@ -536,17 +536,15 @@ } protected void fillResult( - ResultData result, - ResultData rd, - int index, - int size, + ResultData result, + ResultData rd, + int index, + int size, XPathExpression expr, - QName returnType + QName returnType ) { - List rows = rd.getRows(); String [] origColumns = rd.getColumnLabels(); - for (int i = 0, R = rows.size(); i < R; ++i) { - Object [] row = rows.get(i); + for (Object [] row: rd.getRows()) { frames.enter(); try { frames.put(origColumns, row);