Fix a bug in reportlet run, Only both bookmark and instanceid are not…

… null, the document is reportlet document.
eclipse-birt · Aug 11, 2010 · 5e94389 · 5e94389
1 parent 49285af
commit 5e94389
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/....birt.report.engine/src/org/eclipse/birt/report/engine/api/impl/ReportDocumentWriter.java b/....birt.report.engine/src/org/eclipse/birt/report/engine/api/impl/ReportDocumentWriter.java
@@ -365,6 +365,15 @@ private String getBuildNumber( )
 		return "UNKNOWN";
 	}
 
+	public void removeReportletDoucment( )
+	{
+		if ( archive.exists( REPORTLET_DOCUMENT_STREAM ) )
+		{
+			archive.dropStream( REPORTLET_DOCUMENT_STREAM );
+		}
+	}
+
+
 	public void saveReportletDocument( String bookmark, InstanceID iid )
 			throws IOException
 	{

diff --git a/...e/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/api/impl/RunTask.java b/...e/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/api/impl/RunTask.java
@@ -161,10 +161,17 @@ private void openReportDocument( ) throws EngineException
 			writer = new ReportDocumentWriter( engine, archiveWriter, exts );
 			executionContext.setReportDocWriter( writer );
 			DocumentDataSource ds = executionContext.getDataSource( );
-			if ( ds != null && ds.isReportletDocument( ) )
+			if ( ds != null)
 			{
-				writer.saveReportletDocument( ds.getBookmark( ), ds
-						.getInstanceID( ) );
+				if( ds.isReportletDocument( ))
+				{
+					writer.saveReportletDocument( ds.getBookmark( ), ds
+							.getInstanceID( ) );
+				}
+				else
+				{
+					writer.removeReportletDoucment( );
+				}
 			}
 		}
 		catch ( IOException ex )