diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-12-16 14:25:53 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-12-16 14:25:53 +0100 |
| commit | 71ef59a408bf990e6ee7243c71be73e5f0a5b1b3 (patch) | |
| tree | 138f031bb61fbfda9f8f89bc58ab4dbd7d3dd268 /java/src | |
| parent | Missing property setting for ICE-6113 (diff) | |
| download | ice-71ef59a408bf990e6ee7243c71be73e5f0a5b1b3.tar.bz2 ice-71ef59a408bf990e6ee7243c71be73e5f0a5b1b3.tar.xz ice-71ef59a408bf990e6ee7243c71be73e5f0a5b1b3.zip | |
Fixed ICE-6175 - Java selector NPE
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/src/main/java/IceInternal/Selector.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/src/Ice/src/main/java/IceInternal/Selector.java b/java/src/Ice/src/main/java/IceInternal/Selector.java index f6057a55d93..7d5fd3e139e 100644 --- a/java/src/Ice/src/main/java/IceInternal/Selector.java +++ b/java/src/Ice/src/main/java/IceInternal/Selector.java @@ -75,8 +75,9 @@ public final class Selector } handler._disabled = handler._disabled & ~status; - if((handler._registered & status) != 0) + if(handler._key != null && (handler._registered & status) != 0) { + // If registered with the selector, update the registration. updateImpl(handler); } } @@ -89,8 +90,9 @@ public final class Selector } handler._disabled = handler._disabled | status; - if((handler._registered & status) != 0) + if(handler._key != null && (handler._registered & status) != 0) { + // If registered with the selector, update the registration. updateImpl(handler); } } |