ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-01 16:58:27 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

avoid crashes due to calling select or wakeup on a closed Selector

Browse Source
This commit is contained in:
Joel Dice 2012-01-31 09:48:05 -07:00
parent 807f2a8d51
commit b45528203d
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
classpath/java/nio/channels/ClosedSelectorException.java Normal file
View File

@ -0,0 +1,13 @@
/* Copyright (c) 2012, Avian Contributors
Permission to use, copy, modify, and/or distribute this software
for any purpose with or without fee is hereby granted, provided
that the above copyright notice and this permission notice appear
in all copies.
There is NO WARRANTY for this software. See license.txt for
details. */
package java.nio.channels;
public class ClosedSelectorException extends IllegalStateException { }

10
classpath/java/nio/channels/SocketSelector.java
View File

@ -15,7 +15,7 @@ import java.util.Iterator;
import java.net.Socket; import java.net.Socket;
class SocketSelector extends Selector { class SocketSelector extends Selector {
protected long state; protected volatile long state;
protected final Object lock = new Object(); protected final Object lock = new Object();
protected boolean woken = false; protected boolean woken = false;
@ -31,7 +31,7 @@ class SocketSelector extends Selector {
public Selector wakeup() { public Selector wakeup() {
synchronized (lock) { synchronized (lock) {
if (! woken) { if (isOpen() && (! woken)) {
woken = true; woken = true;
natWakeup(state); natWakeup(state);
@ -66,6 +66,10 @@ class SocketSelector extends Selector {
} }
public int doSelect(long interval) throws IOException { public int doSelect(long interval) throws IOException {
if (! isOpen()) {
throw new ClosedSelectorException();
}
selectedKeys.clear(); selectedKeys.clear();
if (clearWoken()) interval = -1; if (clearWoken()) interval = -1;
@ -107,11 +111,13 @@ class SocketSelector extends Selector {
} }
public synchronized void close() { public synchronized void close() {
synchronized (lock) {
if (isOpen()) { if (isOpen()) {
natClose(state); natClose(state);
state = 0; state = 0;
} }
} }
}
private static native long natInit(); private static native long natInit();
private static native void natWakeup(long state); private static native void natWakeup(long state);