/*
 * See the NOTICE file distributed with this work for additional
 * information regarding copyright ownership.
 *
 * This is free software; you can redistribute it and/or modify it
 * under the terms of the GNU Lesser General Public License as
 * published by the Free Software Foundation; either version 2.1 of
 * the License, or (at your option) any later version.
 *
 * This software is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this software; if not, write to the Free
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */
package org.xwiki.filter.output;

import java.io.IOException;
import java.io.Writer;

/**
 * @version $Id$
 * @since 6.2M1
 */
public class DefaultWriterOutputTarget implements WriterOutputTarget
{
    private final Writer writer;

    public DefaultWriterOutputTarget(Writer writer)
    {
        this.writer = writer;
    }

    @Override
    public boolean restartSupported()
    {
        return false;
    }

    @Override
    public Writer getWriter()
    {
        return this.writer;
    }

    @Override
    public void close() throws IOException
    {
        // Closing the writer is the responsibility of the caller
    }

    @Override
    public String toString()
    {
        return getWriter().toString();
    }
}

@@ -1119,16 +1119,50 @@
 riter;%0A%0A
+    private final boolean close;%0A%0A
     publ
@@ -1203,32 +1203,178 @@
 r writer)%0A    %7B%0A
+        this(writer, false);%0A    %7D%0A%0A    /**%0A     * @since 9.0RC1%0A     */%0A    public DefaultWriterOutputTarget(Writer writer, boolean close)%0A    %7B%0A
         this.wri
@@ -1379,32 +1379,60 @@
 riter = writer;%0A
+        this.close = close;%0A
     %7D%0A%0A    @Over
@@ -1669,65 +1669,68 @@
     
-// Closing the writer is the responsibility of the caller
+if (this.close) %7B%0A            this.writer.close();%0A        %7D
 %0A   

Add support for auto close in DefaultReaderInputSource and DefaultWriterOutputTarget