Skip to content

Commit

Permalink
CheckIN:Fix an issue that lead to exception in dashboard table preview.
Browse files Browse the repository at this point in the history
  • Loading branch information
Frostscar committed Apr 11, 2013
1 parent 944b31a commit 50132d5
Showing 1 changed file with 17 additions and 1 deletion.
Expand Up @@ -301,6 +301,11 @@ public IDataSetResultSet loadDataSetData( IResultClass targetResultClass,
Map<String, StringTable> stringTableMap, Map index,
boolean includeInnerID, Map appContext ) throws DataException
{
if( !streamManager.hasInStream( DataEngineContext.DATASET_DATA_STREAM,
StreamManager.ROOT_STREAM,
StreamManager.BASE_SCOPE ) )
return null;

if ( targetResultClass == null )
targetResultClass = this.loadResultClass( includeInnerID );

Expand Down Expand Up @@ -328,16 +333,27 @@ public IDataSetResultSet loadDataSetData( IResultClass targetResultClass,
StreamManager.ROOT_STREAM,
StreamManager.BASE_SCOPE );

int adjustedVersion = resolveVersionConflict( );

return new DataSetResultSet( stream,
lensStream,
this.loadResultClass( ),
preFilteredRowIds,
stringTableMap,
index,
version,
adjustedVersion,
includeInnerID );
}


private int resolveVersionConflict( )
{
if ( version == VersionManager.VERSION_3_7_2_1
&& ( "4.2.0.v20120611".equals( this.context.getBundleVersion( ) ) || "4.2.1.v20120820".equals( this.context.getBundleVersion( ) ) ) )
return VersionManager.VERSION_4_2_1_2;
else
return version;
}
/**
* @param streamPos
* @param streamScope
Expand Down

0 comments on commit 50132d5

Please sign in to comment.