summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlzhang2012-06-01 04:49:35 (EDT)
committer mwu2012-06-01 04:49:35 (EDT)
commit532db38567d31da6ba703f57f15cbd9442ded22a (patch)
treeddd30909c0d09d46196ae6be2842b125c3459ebe
parentc8825a165d76055304ef3266fd09c4b9d34473f3 (diff)
downloadorg.eclipse.birt-532db38567d31da6ba703f57f15cbd9442ded22a.zip
org.eclipse.birt-532db38567d31da6ba703f57f15cbd9442ded22a.tar.gz
org.eclipse.birt-532db38567d31da6ba703f57f15cbd9442ded22a.tar.bz2
Error occurs when running a report with a sorting on aggregation and a
filter. [49051]
-rw-r--r--data/org.eclipse.birt.report.data.adapter/src/org/eclipse/birt/report/data/adapter/impl/ModelAdapter.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/org.eclipse.birt.report.data.adapter/src/org/eclipse/birt/report/data/adapter/impl/ModelAdapter.java b/data/org.eclipse.birt.report.data.adapter/src/org/eclipse/birt/report/data/adapter/impl/ModelAdapter.java
index 328bc15..0fb5089 100644
--- a/data/org.eclipse.birt.report.data.adapter/src/org/eclipse/birt/report/data/adapter/impl/ModelAdapter.java
+++ b/data/org.eclipse.birt.report.data.adapter/src/org/eclipse/birt/report/data/adapter/impl/ModelAdapter.java
@@ -888,7 +888,7 @@ public class ModelAdapter implements IModelAdapter
{
Expression expr = (Expression)arg.getExpressionProperty( AggregationArgument.VALUE_MEMBER ).getValue( );
ScriptExpression scriptExpression = this.adaptExpression( expr );
- if ( "bre".equals( expr.getType( ) ) && scriptExpression == null )
+ if ( expr != null && "bre".equals( expr.getType( ) ) && scriptExpression == null )
throw new AdapterException(Message.formatMessage(
ResourceConstants.INVALID_BINDING_EXPRESSION,
new Object[] { expr.getStringExpression() } ) );