| author | lzhang | 2012-02-10 05:25:07 (EST) |
|---|---|---|
| committer | mwu | 2012-02-10 05:25:07 (EST) |
| commit | 8831d9fd02f6933c6a92774bdb64e04297ccc09c (patch) (side-by-side diff) | |
| tree | b7e8fa21cf2a6c2ef734ca0fc4b947f125d2e708 | |
| parent | 6cded5518310ec0f87f205ff5961903dd5fa6ab3 (diff) | |
| download | org.eclipse.birt-8831d9fd02f6933c6a92774bdb64e04297ccc09c.zip org.eclipse.birt-8831d9fd02f6933c6a92774bdb64e04297ccc09c.tar.gz org.eclipse.birt-8831d9fd02f6933c6a92774bdb64e04297ccc09c.tar.bz2 | |
- Summary:
Ted issue 47438: [Automation]Exception is thrown out when preview report
if add Top/Buttom N filter in cube
- Description of Issue:
When compare two data set design’s filters we also should consider the
filters on the adapted designs.
- TED(s) Resolved:
47438
- Regression ( Yes/No ):
No
- Code Owner Team:
DtE
- Code Reviewers:
Mingxia Wu
- Project ID:
1577
- Manual Test Description:
None
- Tests Automated Cases Executed:
None
- Special Notes:
None
| -rw-r--r-- | data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/executor/OSDataSetDesignComparator.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/executor/OSDataSetDesignComparator.java b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/executor/OSDataSetDesignComparator.java index e38d96d..b982f66 100644 --- a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/executor/OSDataSetDesignComparator.java +++ b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/executor/OSDataSetDesignComparator.java @@ -128,9 +128,12 @@ public class OSDataSetDesignComparator List filter1 = getFilter(dataSetDesign); List filter2 = getFilter(dataSetDesign2); - if( ComparatorUtil.isEqualFilters( filter1, filter2 ) == false ) + if ( ComparatorUtil.isEqualFilters( filter1, filter2 ) == false ) return false; + if ( dataSetDesign.getFilters( ).size() > dataSetDesign2.getFilters( ).size( ) ) + return false; + if ( dataSetDesign.getCacheRowCount( ) != dataSetDesign2.getCacheRowCount( )) return false; return true; |

