log.warn("addStream: endOfStreams is true, not adding InputStream");
log.warn("addStream: endOfStreams is true, not adding InputStream");
} else {
} else {
streams.add(in);
streams.add(in);
if (log.isTraceEnabled()) log.trace("addStream: added stream ("+in.getClass().getSimpleName()+"). this="+this);
}
}
}
}
public void addLastStream (InputStream in) {
public void addLastStream (InputStream in) {
addStream(in);
addStream(in);
endOfStreams = true;
endOfStreams = true;
if (log.isTraceEnabled()) log.trace("addLastStream: added last stream ("+in.getClass().getSimpleName()+"). this="+this);
}
}
@Override public int read() throws IOException {
@Override public int read() throws IOException {
final int val = currentStream.read();
final int val = currentStream.read();
if (val == -1) {
if (val == -1) {
if (streamIndex == streams.size()-1) {
if (streamIndex == streams.size()-1) {
if (log.isTraceEnabled()) log.trace("read(byte): end of all streams? this="+this);
return endOfStreams ? -1 : 0;
return endOfStreams ? -1 : 0;
}
}
currentStream.close();
currentStream.close();
streamIndex++;
streamIndex++;
currentStream = streams.get(streamIndex);
currentStream = streams.get(streamIndex);
if (log.isTraceEnabled()) log.trace("read(byte): end of all stream, advanced to next stream ("+currentStream.getClass().getSimpleName()+"). this="+this);
return read();
return read();
} else {
if (log.isTraceEnabled()) log.trace("read(byte): one byte read. this="+this);
}
}
return val;
return val;
}
}
@@ -57,17 +70,23 @@ public class MultiStream extends InputStream {
final int count = currentStream.read(buf, off, len);
final int count = currentStream.read(buf, off, len);
if (count == -1) {
if (count == -1) {
if (streamIndex == streams.size()-1) {
if (streamIndex == streams.size()-1) {
if (log.isTraceEnabled()) log.trace("read(byte[]): end of all streams? this="+this);
return endOfStreams ? -1 : 0;
return endOfStreams ? -1 : 0;
}
}
currentStream.close();
currentStream.close();
streamIndex++;
streamIndex++;
currentStream = streams.get(streamIndex);
currentStream = streams.get(streamIndex);
if (log.isTraceEnabled()) log.trace("read(byte[]): end of all stream, advanced to next stream ("+currentStream.getClass().getSimpleName()+"). this="+this);
return read(buf, off, len);
return read(buf, off, len);
} else {
if (log.isTraceEnabled()) log.trace("read(byte[]): "+count+" bytes read. this="+this);
}
}
return count;
return count;
}
}
@Override public void close() throws IOException {
@Override public void close() throws IOException {
if (log.isTraceEnabled()) log.trace("close: closing current stream ("+(currentStream == null ? "null" : currentStream.getClass().getSimpleName())+"). this="+this);