Repository: tomee Updated Branches: refs/heads/master f0718d1ad -> efd4aebff
TOMEE-1917 more optimized delegation for Counting streams Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6ae306aa Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6ae306aa Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6ae306aa Branch: refs/heads/master Commit: 6ae306aaead1a0c0a1ef7f61e60b164f0a822ec5 Parents: f0718d1 Author: Romain manni-Bucau <rmannibu...@gmail.com> Authored: Sun Sep 11 16:17:52 2016 +0200 Committer: Romain manni-Bucau <rmannibu...@gmail.com> Committed: Sun Sep 11 16:17:52 2016 +0200 ---------------------------------------------------------------------- .../server/stream/CountingInputStream.java | 23 +++++++++++++++++++- .../server/stream/CountingOutputStream.java | 8 +++++++ 2 files changed, 30 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/6ae306aa/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingInputStream.java ---------------------------------------------------------------------- diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingInputStream.java b/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingInputStream.java index 5012f9f..6c1c372 100644 --- a/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingInputStream.java +++ b/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingInputStream.java @@ -39,6 +39,27 @@ public class CountingInputStream extends InputStream { } @Override + public int read(final byte[] b) throws IOException { + final int read = delegate.read(b); + count += read; + return read; + } + + @Override + public int read(final byte[] b, final int off, final int len) throws IOException { + final int read = delegate.read(b, off, len); + count += read; + return read; + } + + @Override + public long skip(final long n) throws IOException { + final long skip = delegate.skip(n); + count += skip; + return skip; + } + + @Override public int available() throws IOException { return delegate.available(); } @@ -49,7 +70,7 @@ public class CountingInputStream extends InputStream { } @Override - public void mark(int readlimit) { + public void mark(final int readlimit) { delegate.mark(readlimit); } http://git-wip-us.apache.org/repos/asf/tomee/blob/6ae306aa/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingOutputStream.java ---------------------------------------------------------------------- diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingOutputStream.java b/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingOutputStream.java index e847d40..2b63b5f 100644 --- a/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingOutputStream.java +++ b/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingOutputStream.java @@ -46,6 +46,14 @@ public class CountingOutputStream extends FilterOutputStream { super.write(b, off, len); } + public void flush() throws IOException { + out.flush(); + } + + public void close() throws IOException { + out.close(); + } + public int getCount() { return count; }