merge of '7d548bccfc01d30a554dbd176d113a9419be2665'

and 'ccb7faa39e604a125e398cc347f1d5d4da6ac230'

apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocket.java

@@ -3,6 +3,7 @@ package net.i2p.client.streaming;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.channels.SelectableChannel;
 
 import net.i2p.data.Destination;
 
@@ -34,6 +35,8 @@ public interface I2PSocket {
      */
     public OutputStream getOutputStream() throws IOException;
 
+    public SelectableChannel getChannel() throws IOException;
+
     /** 
      * @return socket's configuration
      */

apps/streaming/java/src/net/i2p/client/streaming/I2PSocketFull.java

@@ -3,6 +3,7 @@ package net.i2p.client.streaming;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.channels.SelectableChannel;
 
 import net.i2p.client.I2PSession;
 import net.i2p.data.Destination;
@@ -66,6 +67,10 @@ class I2PSocketFull implements I2PSocket {
         else
             return null;
     }
+
+    public SelectableChannel getChannel() {
+        return new MessageChannel(this);
+    }
     
     /**
      *  Warning, may return null instead of throwing IOE,

apps/streaming/java/src/net/i2p/client/streaming/StandardSocket.java

@@ -71,7 +71,7 @@ class StandardSocket extends Socket {
      */
     @Override
     public SocketChannel getChannel() {
-        return null;
+        return _socket.getChannel();
     }
 
     /**