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/08/31 08:45:51 UTC

mina-sshd git commit: Added some more checks in SftpTest#testCreateSymbolicLink to ensure correct behavior

Repository: mina-sshd
Updated Branches:
  refs/heads/master 2d13858e0 -> 3615e4ffb


Added some more checks in SftpTest#testCreateSymbolicLink to ensure correct behavior


Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/3615e4ff
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/3615e4ff
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/3615e4ff

Branch: refs/heads/master
Commit: 3615e4ffb4a25fa95bb545b972e32a428f72c570
Parents: 2d13858
Author: Lyor Goldstein <lg...@vmware.com>
Authored: Mon Aug 31 09:45:42 2015 +0300
Committer: Lyor Goldstein <lg...@vmware.com>
Committed: Mon Aug 31 09:45:42 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/sshd/server/subsystem/sftp/SftpSubsystem.java | 3 +--
 .../test/java/org/apache/sshd/client/subsystem/sftp/SftpTest.java | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/3615e4ff/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpSubsystem.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpSubsystem.java b/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpSubsystem.java
index a1d9939..7e15fd9 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpSubsystem.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpSubsystem.java
@@ -2868,8 +2868,7 @@ public class SftpSubsystem extends AbstractLoggingBean implements Command, Runna
 
     protected void sendStatus(Buffer buffer, int id, int substatus, String msg, String lang) throws IOException {
         if (log.isDebugEnabled()) {
-            log.debug("Send SSH_FXP_STATUS (substatus={}, lang={}, msg={})",
-                    substatus, lang, msg);
+            log.debug("Send SSH_FXP_STATUS (substatus={}, lang={}, msg={})", substatus, lang, msg);
         }
 
         buffer.putByte((byte) SSH_FXP_STATUS);

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/3615e4ff/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/SftpTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/SftpTest.java b/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/SftpTest.java
index 0c7d64b..3226877 100644
--- a/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/SftpTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/SftpTest.java
@@ -947,8 +947,8 @@ public class SftpTest extends AbstractSftpClientTestSupport {
             assertTrue("Source file not created: " + sourcePath, Files.exists(sourcePath));
             assertEquals("Mismatched stored data in " + remSrcPath, data, readFile(remSrcPath));
 
+            assertFalse("Target link exists before linking: " + linkPath, Files.exists(linkPath));
             c.symlink(remSrcPath, remLinkPath);
-
             assertTrue("Symlink not created: " + linkPath, Files.exists(linkPath));
             assertEquals("Mismatched link data in " + remLinkPath, data, readFile(remLinkPath));