1 files changed, 5 insertions, 23 deletions
diff --git a/src/com/isode/stroke/network/JavaConnection.java b/src/com/isode/stroke/network/JavaConnection.java
index 745655f..c7464ba 100644
--- a/src/com/isode/stroke/network/JavaConnection.java
+++ b/src/com/isode/stroke/network/JavaConnection.java
@@ -4,16 +4,14 @@
  */
 package com.isode.stroke.network;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.Socket;
-import java.net.SocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.CancelledKeyException;
-import java.nio.channels.ClosedChannelException;
 import java.nio.channels.ClosedSelectorException;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.nio.channels.SocketChannel;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -45,12 +43,16 @@ public class JavaConnection extends Connection implements EventOwner {
             watcher_ = watcher;
         }
         
         private boolean isWriteNeeded() {
             return (!writeBuffer_.isEmpty());
         }
+        
+        public HostAddressPort getRemoteAddress() {
+            return address_;
+        }
 
         public void run() {
             try {
                 try {
                     socketChannel_ = SocketChannel.open(
                             new InetSocketAddress(address_.getAddress().getInetAddress(),address_.getPort()));
@@ -515,33 +517,13 @@ public class JavaConnection extends Connection implements EventOwner {
         }
         return new HostAddressPort(new HostAddress(socket.getLocalAddress()), socket.getLocalPort());        
     }
     
     @Override
     public HostAddressPort getRemoteAddress() {
-        if (socketChannel_ == null) {
-            return null;
-        }
-        SocketAddress remoteAddress;
-        try {
-            remoteAddress = socketChannel_.getRemoteAddress();
-        } catch (ClosedChannelException e) {
-            return null;
-        } catch (IOException e) {
-            return null;
-        }
-        if (!(remoteAddress instanceof InetSocketAddress)) {
-            // SocketChannel.getRemoteAddress should return a
-            // InetSocketAddress if it is bound to an IP Socket
-            // Address so return null if it does not
-            return null;
-        }
-        InetSocketAddress remoteInetAddress = (InetSocketAddress) remoteAddress;
-        return new HostAddressPort(
-                new HostAddress(remoteInetAddress.getAddress()),
-                remoteInetAddress.getPort());
+        return worker_.getRemoteAddress();
     }
     
     @Override
     public String toString()
     {
         return "JavaConnection " +