| author | pshi | 2011-11-02 03:30:13 (EDT) |
|---|---|---|
| committer | mwu | 2011-11-02 03:30:13 (EDT) |
| commit | e8daa106585b9ace40fca17636f44cdba409355d (patch) (side-by-side diff) | |
| tree | 060a5b81718fe307f41dd294ad458bce037cd25b | |
| parent | 2f2bd4c7ba06bd10cf7be9bd5f9f902febf172cc (diff) | |
| download | org.eclipse.birt-e8daa106585b9ace40fca17636f44cdba409355d.zip org.eclipse.birt-e8daa106585b9ace40fca17636f44cdba409355d.tar.gz org.eclipse.birt-e8daa106585b9ace40fca17636f44cdba409355d.tar.bz2 | |
fix ted 43040 null pointer bug
| -rw-r--r-- | data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/executor/transform/SimpleGroupCalculator.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/executor/transform/SimpleGroupCalculator.java b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/executor/transform/SimpleGroupCalculator.java index 29ff8c3..84a8ebc 100644 --- a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/executor/transform/SimpleGroupCalculator.java +++ b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/executor/transform/SimpleGroupCalculator.java @@ -226,7 +226,10 @@ public class SimpleGroupCalculator implements IGroupCalculator } this.aggrHelper.onRow( this.getStartingGroup( ), this.getEndingGroup( ), this.current, rowId); - if ( this.runningAggrs.size( ) > 0 ) + if ( this.runningAggrs.size( ) > 0 + && this.combinedAggrOutput != null + && this.combinedAggrRAOutput != null + && this.combinedAggrIndexOutput != null) { for ( String aggrName : this.runningAggrs ) { @@ -246,7 +249,11 @@ public class SimpleGroupCalculator implements IGroupCalculator saveToAggrValuesToDocument( i, rowId ); } - if( this.overallAggrs.size( ) > 0 && this.combinedAggrIndexOutput!= null ) + if ( this.overallAggrs.size( ) > 0 + && this.combinedAggrIndexOutput != null + && this.combinedAggrIndexRAOutput != null + && this.combinedAggrRAOutput != null + && this.combinedAggrOutput != null ) { this.combinedAggrIndexRAOutput.seek( 0 ); IOUtil.writeLong( this.combinedAggrIndexOutput, this.combinedAggrRAOutput.getOffset( ) ); |