/*
 * $Id$
 * Copyright (C) 2001-2003 The Apache Software Foundation. All rights reserved.
 * For details on use and redistribution please refer to the
 * LICENSE file included with these sources.
 */

package org.apache.fop.apps;

// SAX
import org.xml.sax.XMLReader;

// Java
import java.io.BufferedOutputStream;
import java.io.FileOutputStream;


/**
 * super class for all classes which start Fop from the commandline
 *
 * Modified to use new streaming API by Mark Lillywhite, mark-fop@inomial.com
 */
public class CommandLineStarter extends Starter {

    protected CommandLineOptions commandLineOptions;

    public CommandLineStarter(CommandLineOptions commandLineOptions)
    throws FOPException {
        this.commandLineOptions = commandLineOptions;
        super.setInputHandler(commandLineOptions.getInputHandler());
    }

    /**
     * Run the format.
     * @exception FOPException if there is an error during processing
     */
    public void run() throws FOPException {
        String version = Version.getVersion();

        getLogger().info(version);

        XMLReader parser = inputHandler.getParser();
        setParserFeatures(parser);

        Driver driver = new Driver();
        setupLogger(driver);
        driver.initialize();

        try {
            driver.setRenderer(commandLineOptions.getRenderer());
            BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(
                                      commandLineOptions.getOutputFile()));
            driver.setOutputStream(bos);
            if (driver.getRenderer() != null) {
                driver.getRenderer().setOptions(
              commandLineOptions.getRendererOptions());
            }
            driver.render(parser, inputHandler.getInputSource());
            bos.close();
            System.exit(0);
        } catch (Exception e) {
            if (e instanceof FOPException) {
                throw (FOPException) e;
            }
            throw new FOPException(e);
        }
    }

}


@@ -1491,24 +1491,46 @@
 utFile()));%0A
+            try %7B%0A    
             
@@ -1558,16 +1558,20 @@
 m(bos);%0A
+    
         
@@ -1622,24 +1622,28 @@
             
+ 
+   
 driver.getRe
@@ -1669,32 +1669,36 @@
 (%0A              
+  
+  
 commandLineOptio
@@ -1727,34 +1727,42 @@
 ));%0A            
-%7D%0A
+    %7D%0A    
             driv
@@ -1827,20 +1827,62 @@
     
-bos.close();
+%7D finally %7B%0A                bos.close();%0A            %7D
 %0A   

Make sure OutputStream gets closed in case of an Exception