svn commit: r1341035 - in /mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd: ClientChannel.java client/channel/AbstractClientChannel.java

[gnodet]

Author: gnodet
Date: Mon May 21 14:08:31 2012
New Revision: 1341035

URL: http://svn.apache.org/viewvc?rev=1341035&view=rev
Log:
[SSHD-167] Allow the ClientChannel#waitFor to wait for the channel to be opened

Modified:
    mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/ClientChannel.java
    
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/channel/AbstractClientChannel.java

Modified: 
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/ClientChannel.java
URL: 
http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/ClientChannel.java?rev=1341035&r1=1341034&r2=1341035&view=diff
==============================================================================
--- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/ClientChannel.java 
(original)
+++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/ClientChannel.java 
Mon May 21 14:08:31 2012
@@ -44,6 +44,7 @@ public interface ClientChannel {
     int EOF =         0x0010;
     int EXIT_STATUS = 0x0020;
     int EXIT_SIGNAL = 0x0040;
+    int OPENED =      0x0080;
 
     void setIn(InputStream in);
 

Modified: 
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/channel/AbstractClientChannel.java
URL: 
http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/channel/AbstractClientChannel.java?rev=1341035&r1=1341034&r2=1341035&view=diff
==============================================================================
--- 
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/channel/AbstractClientChannel.java
 (original)
+++ 
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/channel/AbstractClientChannel.java
 Mon May 21 14:08:31 2012
@@ -30,7 +30,6 @@ import org.apache.sshd.common.SshExcepti
 import org.apache.sshd.common.channel.AbstractChannel;
 import org.apache.sshd.common.future.CloseFuture;
 import org.apache.sshd.common.future.SshFutureListener;
-import org.apache.sshd.common.session.AbstractSession;
 import org.apache.sshd.common.util.Buffer;
 import org.apache.sshd.common.util.IoUtils;
 
@@ -117,6 +116,9 @@ public abstract class AbstractClientChan
         synchronized (lock) {
             for (;;) {
                 int cond = 0;
+                if (openFuture != null && openFuture.isOpened()) {
+                    cond |= OPENED;
+                }
                 if (closeFuture.isClosed()) {
                     cond |= CLOSED | EOF;
                 }