Blocking actions should log all errors, rename runOnce to action ever…

…ywhere.

pom.xml

@@ -45,7 +45,7 @@
             <dependency>
                 <groupId>net.openhft</groupId>
                 <artifactId>chronicle-bom</artifactId>
-                <version>1.4.3</version>
+                <version>1.4.4-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

src/main/java/net/openhft/chronicle/network/AcceptorEventHandler.java

@@ -21,6 +21,7 @@
 import net.openhft.chronicle.threads.HandlerPriority;
 import net.openhft.chronicle.threads.api.EventHandler;
 import net.openhft.chronicle.threads.api.EventLoop;
+import net.openhft.chronicle.threads.api.InvalidEventHandlerException;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,14 +38,13 @@
  * Created by peter.lawrey on 22/01/15.
  */
 public class AcceptorEventHandler implements EventHandler,Closeable {
+    private static final Logger LOG = LoggerFactory.getLogger(AcceptorEventHandler.class);
     @NotNull
     private final Supplier<TcpHandler> tcpHandlerSupplier;
     @NotNull
     private final Supplier<SessionDetailsProvider> sessionDetailsSupplier;
-    private EventLoop eventLoop;
     private final ServerSocketChannel ssc;
-
-    private static final Logger LOG = LoggerFactory.getLogger(AcceptorEventHandler.class);
+    private EventLoop eventLoop;
 
     public AcceptorEventHandler(int port,
                                 @NotNull final Supplier<TcpHandler> tcpHandlerSupplier,
@@ -67,7 +67,9 @@ public void eventLoop(EventLoop eventLoop) {
     }
 
     @Override
-    public boolean runOnce()  {
+    public boolean action() throws InvalidEventHandlerException {
+        if (!ssc.isOpen()) throw new InvalidEventHandlerException();
+
         try {
             SocketChannel sc = ssc.accept();
 
@@ -109,11 +111,6 @@ public HandlerPriority priority() {
         return HandlerPriority.BLOCKING;
     }
 
-    @Override
-    public boolean isDead() {
-        return !ssc.isOpen();
-    }
-
     @Override
     public void close() throws IOException {
         closeSocket();

src/main/java/net/openhft/chronicle/network/TcpEventHandler.java

@@ -23,6 +23,7 @@
 import net.openhft.chronicle.threads.HandlerPriority;
 import net.openhft.chronicle.threads.api.EventHandler;
 import net.openhft.chronicle.threads.api.EventLoop;
+import net.openhft.chronicle.threads.api.InvalidEventHandlerException;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
@@ -75,7 +76,9 @@ public void eventLoop(@NotNull EventLoop eventLoop) {
     }
 
     @Override
-    public boolean runOnce() {
+    public boolean action() throws InvalidEventHandlerException {
+        if (!sc.isOpen()) throw new InvalidEventHandlerException();
+
         try {
             int read = inBB.remaining() > 0 ? sc.read(inBB) : 1;
             if (read < 0) {
@@ -113,10 +116,6 @@ void invokeHandler() throws IOException {
         }
     }
 
-    @Override
-    public boolean isDead() {
-        return !sc.isOpen();
-    }
 
     void handleIOE(@NotNull IOException e) {
         e.printStackTrace();
@@ -146,7 +145,9 @@ boolean tryWrite() throws IOException {
 
     class WriteEventHandler implements EventHandler {
         @Override
-        public boolean runOnce() {
+        public boolean action() throws InvalidEventHandlerException {
+            if (!sc.isOpen()) throw new InvalidEventHandlerException();
+
             try {
                 // get more data to write if the buffer was empty
                 // or we can write some of what is there
@@ -162,10 +163,5 @@ public boolean runOnce() {
             }
             return false;
         }
-
-        @Override
-        public boolean isDead() {
-            return !sc.isOpen();
-        }
     }
 }