From 567a46687e4e796758f84db224e46b028ba44f8c Mon Sep 17 00:00:00 2001
From: lzhang <lzhang@actuate.com>
Date: Thu, 12 Sep 2013 11:22:32 +0800
Subject: [PATCH] failed to run a report that based on Data Model with pushdown
 on couple computed columns [63254]

---
 .../org/eclipse/birt/data/engine/impl/PreparedOdaDSQuery.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/impl/PreparedOdaDSQuery.java b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/impl/PreparedOdaDSQuery.java
index 4bb1149a5ba..3d7ae1d8304 100644
--- a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/impl/PreparedOdaDSQuery.java
+++ b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/impl/PreparedOdaDSQuery.java
@@ -343,14 +343,16 @@ protected IQuery createOdiQuery( ) throws DataException
 							&& computedColumnsMap.get( extDataSet.getName( ) ) != null )
 					{
 						List computedColumns = extDataSet.getComputedColumns( );
+						List toBeRemovedComputedColumns = new ArrayList();
 						for ( int i = 0; i < computedColumns.size( ); i++ )
 						{
 							if ( computedColumnsMap.get( extDataSet.getName( ) )
 									.contains( ( (IComputedColumn) computedColumns.get( i ) ).getName( ) ) )
 							{
-								computedColumns.remove( i );
+								toBeRemovedComputedColumns.add( computedColumns.get( i ) );
 							}
 						}
+						computedColumns.removeAll( toBeRemovedComputedColumns );
 					}
 
 					List<IColumnDefinition> resultSets = queryOptimizeHints.getResultSetsForCombinedQuery( );