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 2015/11/26 06:33:06 UTC
[05/10] mina-sshd git commit: Provide a better hint to the allocated
message buffer size
Provide a better hint to the allocated message buffer size
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/5e733958
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/5e733958
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/5e733958
Branch: refs/heads/master
Commit: 5e7339584733ddb42fca41cf2394067674be8cd1
Parents: 1ceea03
Author: Lyor Goldstein <lg...@vmware.com>
Authored: Thu Nov 26 07:20:53 2015 +0200
Committer: Lyor Goldstein <lg...@vmware.com>
Committed: Thu Nov 26 07:20:53 2015 +0200
----------------------------------------------------------------------
.../apache/sshd/client/subsystem/sftp/AbstractSftpClient.java | 6 +++---
.../org/apache/sshd/common/forward/DefaultTcpipForwarder.java | 2 +-
.../org/apache/sshd/server/forward/TcpipServerChannel.java | 2 +-
.../java/org/apache/sshd/server/x11/X11ForwardSupport.java | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5e733958/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/AbstractSftpClient.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/AbstractSftpClient.java b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/AbstractSftpClient.java
index d648b2b..009d48a 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/AbstractSftpClient.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/AbstractSftpClient.java
@@ -975,7 +975,7 @@ public abstract class AbstractSftpClient extends AbstractLoggingBean implements
throw new IOException("canonicalPath(" + path + ") client is closed");
}
- Buffer buffer = new ByteArrayBuffer();
+ Buffer buffer = new ByteArrayBuffer(path.length() + Long.SIZE);
buffer.putString(path);
return checkOneName(SftpConstants.SSH_FXP_REALPATH, buffer);
}
@@ -986,7 +986,7 @@ public abstract class AbstractSftpClient extends AbstractLoggingBean implements
throw new IOException("stat(" + path + ") client is closed");
}
- Buffer buffer = new ByteArrayBuffer();
+ Buffer buffer = new ByteArrayBuffer(path.length() + Long.SIZE);
buffer.putString(path);
int version = getVersion();
@@ -1003,7 +1003,7 @@ public abstract class AbstractSftpClient extends AbstractLoggingBean implements
throw new IOException("lstat(" + path + ") client is closed");
}
- Buffer buffer = new ByteArrayBuffer();
+ Buffer buffer = new ByteArrayBuffer(path.length() + Long.SIZE);
buffer.putString(path);
int version = getVersion();
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5e733958/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultTcpipForwarder.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultTcpipForwarder.java b/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultTcpipForwarder.java
index 524e804..0a239c0 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultTcpipForwarder.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultTcpipForwarder.java
@@ -413,7 +413,7 @@ public class DefaultTcpipForwarder extends AbstractInnerCloseable implements Tcp
@Override
public void messageReceived(IoSession session, Readable message) throws Exception {
TcpipClientChannel channel = (TcpipClientChannel) session.getAttribute(TcpipClientChannel.class);
- Buffer buffer = new ByteArrayBuffer();
+ Buffer buffer = new ByteArrayBuffer(message.available() + Long.SIZE);
buffer.putBuffer(message);
channel.waitFor(EnumSet.of(ClientChannel.ClientChannelEvent.OPENED, ClientChannel.ClientChannelEvent.CLOSED), Long.MAX_VALUE);
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5e733958/sshd-core/src/main/java/org/apache/sshd/server/forward/TcpipServerChannel.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/forward/TcpipServerChannel.java b/sshd-core/src/main/java/org/apache/sshd/server/forward/TcpipServerChannel.java
index 2641601..dbfd767 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/forward/TcpipServerChannel.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/forward/TcpipServerChannel.java
@@ -152,7 +152,7 @@ public class TcpipServerChannel extends AbstractServerChannel {
log.debug("doInit({}) Ignoring write to channel in CLOSING state", TcpipServerChannel.this);
}
} else {
- Buffer buffer = new ByteArrayBuffer();
+ Buffer buffer = new ByteArrayBuffer(message.available() + Long.SIZE);
buffer.putBuffer(message);
out.write(buffer.array(), buffer.rpos(), buffer.available());
out.flush();
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5e733958/sshd-core/src/main/java/org/apache/sshd/server/x11/X11ForwardSupport.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/x11/X11ForwardSupport.java b/sshd-core/src/main/java/org/apache/sshd/server/x11/X11ForwardSupport.java
index 5bea64a..55f8b45 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/x11/X11ForwardSupport.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/x11/X11ForwardSupport.java
@@ -166,7 +166,7 @@ public class X11ForwardSupport extends AbstractInnerCloseable implements IoHandl
@Override
public void messageReceived(IoSession session, Readable message) throws Exception {
ChannelForwardedX11 channel = (ChannelForwardedX11) session.getAttribute(ChannelForwardedX11.class);
- Buffer buffer = new ByteArrayBuffer();
+ Buffer buffer = new ByteArrayBuffer(message.available() + Long.SIZE);
buffer.putBuffer(message);
OutputStream outputStream = channel.getInvertedIn();