[refactor] propagate IOError from selector exception

Author: kares

src/main/java/org/jruby/ext/openssl/SSLSocket.java

@@ -31,6 +31,7 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.Channel;
 import java.nio.channels.ClosedChannelException;
+import java.nio.channels.ClosedSelectorException;
 import java.nio.channels.NotYetConnectedException;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
@@ -452,9 +453,9 @@ private Object waitSelect(final int operations, final boolean blocking, final bo
                 try {
                     result[0] = selector.selectNow();
 
-                    if ( result[0] == 0 ) {
+                    if (result[0] == 0) {
                         if ((operations & SelectionKey.OP_READ) != 0 && (operations & SelectionKey.OP_WRITE) != 0) {
-                            if ( key.isReadable() ) {
+                            if (key.isReadable()) {
                                 writeWouldBlock(runtime, exception, result);
                             }
                             //else if ( key.isWritable() ) {
@@ -463,28 +464,27 @@ private Object waitSelect(final int operations, final boolean blocking, final bo
                             else { //neither, pick one
                                 readWouldBlock(runtime, exception, result);
                             }
-                        }
-                        else if ((operations & SelectionKey.OP_READ) != 0) {
+                        } else if ((operations & SelectionKey.OP_READ) != 0) {
                             readWouldBlock(runtime, exception, result);
-                        }
-                        else if ((operations & SelectionKey.OP_WRITE) != 0) {
+                        } else if ((operations & SelectionKey.OP_WRITE) != 0) {
                             writeWouldBlock(runtime, exception, result);
                         }
                     }
-                } catch (IOException ioe) {
-                    debugStackTrace(runtime, "SSLSocket.waitSelect", ioe);
-                    throw runtime.newRuntimeError("Error with selector: " + ioe.getMessage());
+                } catch (ClosedSelectorException ex) {
+                    throw Utils.newRuntimeError(runtime, "selector closed", ex);
+                } catch (IOException ex) {
+                    throw Utils.newIOError(runtime, ex);
                 }
             } else {
                 io.addBlockingThread(thread);
                 thread.executeBlockingTask(new RubyThread.BlockingTask() {
-                    public void run() throws InterruptedException {
+                    public void run() {
                         try {
                             result[0] = selector.select();
-                        }
-                        catch (IOException ioe) {
-                            debugStackTrace(runtime, "SSLSocket.waitSelect", ioe);
-                            throw runtime.newRuntimeError("Error with selector: " + ioe.getMessage());
+                        } catch (ClosedSelectorException ex) {
+                            throw Utils.newRuntimeError(runtime, "selector closed", ex);
+                        } catch (IOException ex) {
+                            throw Utils.newIOError(runtime, ex);
                         }
                     }
 

src/main/java/org/jruby/ext/openssl/Utils.java

@@ -49,17 +49,25 @@ final class Utils {
     private Utils() {}
 
     static RaiseException newIOError(Ruby runtime, IOException e) {
-        RaiseException ex = newIOError(runtime, e.getMessage());
-        ex.initCause(e);
-        return ex;
+        return newIOError(runtime, e.getMessage(), e);
     }
 
     static RaiseException newIOError(Ruby runtime, String msg) {
         return new RaiseException(runtime, runtime.getIOError(), msg, true);
     }
 
+    static RaiseException newIOError(Ruby runtime, String msg, Exception e) {
+        RaiseException ex = newIOError(runtime, msg);
+        ex.initCause(e);
+        return ex;
+    }
+
     static RaiseException newRuntimeError(Ruby runtime, Exception e) {
-        RaiseException ex = newRuntimeError(runtime, e.getMessage());
+        return newRuntimeError(runtime, e.getMessage(), e);
+    }
+
+    static RaiseException newRuntimeError(Ruby runtime, String msg, Exception e) {
+        RaiseException ex = newRuntimeError(runtime, msg);
         ex.initCause(e);
         return ex;
     }