You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by lg...@apache.org on 2016/02/21 12:39:51 UTC
[4/5] mina-sshd git commit: Made members and methods of
BufferedIoOutputStream protected to allow implementation overrides
Made members and methods of BufferedIoOutputStream protected to allow implementation overrides
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/51a767b0
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/51a767b0
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/51a767b0
Branch: refs/heads/master
Commit: 51a767b07684e988fa10ffb2bc3b0cd074d3a3db
Parents: 6f246ac
Author: Lyor Goldstein <ly...@gmail.com>
Authored: Sun Feb 21 12:23:38 2016 +0200
Committer: Lyor Goldstein <ly...@gmail.com>
Committed: Sun Feb 21 12:23:38 2016 +0200
----------------------------------------------------------------------
.../sshd/common/channel/BufferedIoOutputStream.java | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/51a767b0/sshd-core/src/main/java/org/apache/sshd/common/channel/BufferedIoOutputStream.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/channel/BufferedIoOutputStream.java b/sshd-core/src/main/java/org/apache/sshd/common/channel/BufferedIoOutputStream.java
index b035c1d..d496e24 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/channel/BufferedIoOutputStream.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/channel/BufferedIoOutputStream.java
@@ -31,13 +31,12 @@ import org.apache.sshd.common.util.buffer.Buffer;
import org.apache.sshd.common.util.closeable.AbstractInnerCloseable;
/**
- * An IoOutputStream capable of queuing write requests
+ * An {@link IoOutputStream} capable of queuing write requests
*/
public class BufferedIoOutputStream extends AbstractInnerCloseable implements IoOutputStream {
-
- private final IoOutputStream out;
- private final Queue<IoWriteFutureImpl> writes = new ConcurrentLinkedQueue<IoWriteFutureImpl>();
- private final AtomicReference<IoWriteFutureImpl> currentWrite = new AtomicReference<IoWriteFutureImpl>();
+ protected final IoOutputStream out;
+ protected final Queue<IoWriteFutureImpl> writes = new ConcurrentLinkedQueue<IoWriteFutureImpl>();
+ protected final AtomicReference<IoWriteFutureImpl> currentWrite = new AtomicReference<IoWriteFutureImpl>();
public BufferedIoOutputStream(IoOutputStream out) {
this.out = out;
@@ -45,7 +44,7 @@ public class BufferedIoOutputStream extends AbstractInnerCloseable implements Io
@Override
public IoWriteFuture write(Buffer buffer) {
- final IoWriteFutureImpl future = new IoWriteFutureImpl(buffer);
+ IoWriteFutureImpl future = new IoWriteFutureImpl(buffer);
if (isClosing()) {
future.setValue(new IOException("Closed"));
} else {
@@ -55,7 +54,7 @@ public class BufferedIoOutputStream extends AbstractInnerCloseable implements Io
return future;
}
- private void startWriting() {
+ protected void startWriting() {
final IoWriteFutureImpl future = writes.peek();
if (future != null) {
if (currentWrite.compareAndSet(null, future)) {
@@ -70,7 +69,6 @@ public class BufferedIoOutputStream extends AbstractInnerCloseable implements Io
finishWrite();
}
- @SuppressWarnings("synthetic-access")
private void finishWrite() {
writes.remove(future);
currentWrite.compareAndSet(future, null);
@@ -91,6 +89,6 @@ public class BufferedIoOutputStream extends AbstractInnerCloseable implements Io
@Override
public String toString() {
- return "BufferedIoOutputStream[" + out + "]";
+ return getClass().getSimpleName() + "[" + out + "]";
}
}