diff options
| author | Joe George <joe@zeroc.com> | 2017-03-28 10:25:16 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2017-03-28 10:25:16 -0400 |
| commit | 7f80ea0db36533c25ffacfccb05a4b8ee657a95f (patch) | |
| tree | 7b619b723fa94ac7996ca9578eae3fbf40f4cc9e /java-compat/src | |
| parent | ICE-7707 Improved handling of argc/argv arguments (diff) | |
| parent | ICE-7483 - Rename OS X to macOS (diff) | |
| download | ice-7f80ea0db36533c25ffacfccb05a4b8ee657a95f.tar.bz2 ice-7f80ea0db36533c25ffacfccb05a4b8ee657a95f.tar.xz ice-7f80ea0db36533c25ffacfccb05a4b8ee657a95f.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'java-compat/src')
| -rw-r--r-- | java-compat/src/Ice/src/main/java/IceInternal/Selector.java | 2 | ||||
| -rw-r--r-- | java-compat/src/Ice/src/main/java/IceInternal/UdpTransceiver.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Selector.java b/java-compat/src/Ice/src/main/java/IceInternal/Selector.java index caf607a60d3..cd0d471821a 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Selector.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Selector.java @@ -262,7 +262,7 @@ public final class Selector } catch(java.nio.channels.CancelledKeyException ex) { - // This sometime occurs on OS X, ignore. + // This sometime occurs on macOS, ignore. continue; } catch(java.io.IOException ex) diff --git a/java-compat/src/Ice/src/main/java/IceInternal/UdpTransceiver.java b/java-compat/src/Ice/src/main/java/IceInternal/UdpTransceiver.java index 288af7da40d..15979f8aac1 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/UdpTransceiver.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/UdpTransceiver.java @@ -381,7 +381,7 @@ final class UdpTransceiver implements Transceiver Network.setBlock(_fd, false); // // NOTE: setting the multicast interface before performing the - // connect is important for some OS such as OS X. + // connect is important for some OS such as macOS. // if(_addr.getAddress().isMulticastAddress()) { |