Skip to content

Commit

Permalink
revert change of T68653
Browse files Browse the repository at this point in the history
  • Loading branch information
yaoping committed Nov 8, 2013
1 parent a8d2221 commit e888f07
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
Expand Up @@ -1731,10 +1731,9 @@ protected IQueryResults executeDataSetQuery( QueryDefinition queryDefn )
* @param queryDefn
* @throws AdapterException
* @throws DataException
* @throws ChartException
*/
protected void setQueryDefinitionWithDataSet( Chart cm, ExtendedItemHandle handle,
QueryDefinition queryDefn ) throws AdapterException, DataException, ChartException
QueryDefinition queryDefn ) throws AdapterException, DataException
{
// Iterate parameter bindings to check if its expression is a
// explicit
Expand All @@ -1744,13 +1743,7 @@ protected void setQueryDefinitionWithDataSet( Chart cm, ExtendedItemHandle handl

// Add bindings and filters from report handle.
Iterator<?> bindingIt = getUsedDataSetBindings( cm, handle );
if ( bindingIt == null || !bindingIt.hasNext( ) )
{
throw new ChartException( ChartReportItemPlugin.ID,
ChartException.DATA_BINDING,
Messages.getString( "exception.no.valid.binding" ) ); //$NON-NLS-1$
}
while ( bindingIt.hasNext( ) )
while ( bindingIt != null && bindingIt.hasNext( ) )
{
Object computedBinding = bindingIt.next( );
IBinding binding = session.getModelAdaptor( )
Expand Down
Expand Up @@ -106,5 +106,3 @@ ChartCubeFilterConditionBuilder.Expression.ValueItemPrefix=Value:
ChartCubeFilterConditionBuilder.Expression.YOptionItem.Prefix=Y Option:
ChartCubeFilterConditionBuilder.SelectValueDialog.messages.info.selectVauleUnavailable=Value list unavailable with given expression.
ChartCubeFilterConditionBuilder.SelectValueDialog.messages.info.illegalVauleExpr=Only the expression with format like data["name"]/[name] can get its value list.

exception.no.valid.binding=No valid bindings. Please check if the expressions are correct.

0 comments on commit e888f07

Please sign in to comment.