1 files changed, 5 insertions, 4 deletions

diff --git a/src/main/java/org/gnunet/util/Connection.java b/src/main/java/org/gnunet/util/Connection.java
index 1c569c4..c8b6a48 100644
--- a/src/main/java/org/gnunet/util/Connection.java
+++ b/src/main/java/org/gnunet/util/Connection.java
@@ -31,6 +31,7 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
+import java.nio.channels.SelectionKey;
 import java.nio.channels.SocketChannel;
 import java.nio.channels.spi.SelectorProvider;
 import java.util.LinkedList;
@@ -101,7 +102,7 @@ public class Connection {
     /**
      * Timeout task for the connect notify.
      */
-    private Scheduler.TaskConfiguration notifyConnectedTimeout;
+    private Scheduler.TaskIdentifier notifyConnectedTimeout;
 
     /**
      * Continuation to call when connected
@@ -159,7 +160,7 @@ public class Connection {
         private MessageReceiver receiver;
         private RelativeTime timeout;
         private GnunetMessage.Header msgh = null;
-        private Scheduler.TaskConfiguration recvTask = null;
+        private Scheduler.TaskIdentifier recvTask = null;
         private boolean finished = false;
         // is this receiver actively working? if not, the connection process has to kick off the receiver
         // (or select behaves badly)
@@ -367,7 +368,7 @@ public class Connection {
             // of a message, only the max. wait time before transmission.
             // cancel must be called on the transmitTask if we disconnect
             Scheduler.TaskConfiguration tc = new Scheduler.TaskConfiguration(RelativeTime.FOREVER, this);
-            tc.selectWrite(connectionChannel);
+            tc.addSelectEvent(connectionChannel, SelectionKey.OP_WRITE);
             this.transmitTask = tc.schedule();
         }
 
@@ -450,7 +451,7 @@ public class Connection {
                 return;
             }
 
-            tc.selectConnect(channel);
+            tc.addSelectEvent(channel, SelectionKey.OP_CONNECT);
 
             addressProbe.connectTask = tc.schedule();
         }