Refactor for extension use.

Signed-off-by: sguan <sguan@actuate.com>
eclipse-birt · Jan 6, 2015 · 3d84c6a · 3d84c6a
1 parent 4eafab7
commit 3d84c6a
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/...se.birt.report.engine/src/org/eclipse/birt/report/engine/api/impl/DatasetPreviewTask.java b/...se.birt.report.engine/src/org/eclipse/birt/report/engine/api/impl/DatasetPreviewTask.java
@@ -337,8 +337,8 @@ protected IExtractionResults doRun( ) throws EngineException
 	protected IExtractionResults extractQuery( DataSetHandle dataset )
 			throws BirtException
 	{
-		QueryDefinition newQuery = constructQuery( dataset );
 		DataRequestSession session = executionContext.getDataEngine( ).getDTESession( );
+		QueryDefinition newQuery = constructQuery( dataset, session );
 		ModelDteApiAdapter apiAdapter = new ModelDteApiAdapter(
 				executionContext );
 		apiAdapter.defineDataSet( dataset, session );
@@ -361,11 +361,16 @@ protected ModuleHandle getModuleHandle( )
 		return dataset.getModuleHandle( );
 	}
 
-	protected QueryDefinition constructQuery( DataSetHandle dataset )
-			throws DataException
+	protected QueryDefinition constructQuery( DataSetHandle dataset, DataRequestSession session )
+			throws BirtException
 	{
 		if ( this.query != null )
 			return this.query;
+		if ( dataset
+				.getCachedMetaDataHandle( ) == null )
+		{
+			session.refreshMetaData( dataset );
+		}
 		QueryDefinition query = new QueryDefinition( );
 		query.setDataSetName( dataset.getQualifiedName( ) );
 		Set<String> existBindings = new HashSet<String>( );