/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 *   http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 * 
 */

package org.apache.commons.net.nntp;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.Reader;
import java.util.Iterator;
import java.util.NoSuchElementException;

import org.apache.commons.net.io.DotTerminatedMessageReader;
import org.apache.commons.net.io.Util;

/**
 * Wraps a {@link Reader} and returns an {@code Iterable<String>}
 * which returns the individual lines from the reader.
 * @since 3.0
 */
class ReplyIterator implements Iterator<String>, Iterable<String> {

    private final BufferedReader reader;        

    private String line;
    
    private Exception savedException;

    ReplyIterator(Reader _reader) throws IOException {
        reader = new BufferedReader(new DotTerminatedMessageReader(_reader));
        line = reader.readLine(); // prime the iterator
        if (line == null) {
            Util.closeQuietly(reader);
        }
    }

    public boolean hasNext() {
        if (savedException != null){
            throw new NoSuchElementException(savedException.toString());            
        }
        return line != null;
    }

    public String next() throws NoSuchElementException {
        if (savedException != null){
            throw new NoSuchElementException(savedException.toString());            
        }
        String prev = line;
        if (prev == null) {
            throw new NoSuchElementException();
        }
        try {
            line = reader.readLine(); // save next line
            if (line == null) {
                Util.closeQuietly(reader);
            }
        } catch (IOException ex) {
            savedException = ex; // if it fails, save the exception, as it does not apply to this call
            Util.closeQuietly(reader);
        }
        return prev;
    }

    public void remove() {
        throw new UnsupportedOperationException();
    }

    public Iterator<String> iterator() {
        return this;
    }
}

@@ -1419,16 +1419,207 @@
 ption;%0A%0A
+    /**%0A     *%0A     * @param _reader the reader to wrap%0A     * @param addDotReader whether to additionally wrap the reader in a DotTerminatedMessageReader %0A     * @throws IOException%0A     */%0A
     Repl
@@ -1642,16 +1642,38 @@
  _reader
+, boolean addDotReader
 ) throws
@@ -1723,16 +1723,31 @@
 dReader(
+addDotReader ? 
 new DotT
@@ -1777,16 +1777,26 @@
 _reader)
+ : _reader
 );%0A     
@@ -1905,32 +1905,32 @@
 uietly(reader);%0A
-
         %7D%0A    %7D%0A
@@ -1922,32 +1922,131 @@
        %7D%0A    %7D%0A%0A
+    ReplyIterator(BufferedReader _reader) throws IOException %7B%0A        this(_reader, true);%0A    %7D%0A%0A
     public boole

Make wrapping with DotTerminatedMessageReader optional