Merge files from jdk11u/jdk-11+28 into the expected_upstream branch
List of files:
ojluni/src/main/java/jdk/net/ExtendedSocketOptions.java
ojluni/src/main/java/sun/nio/ch/AllocatedNativeObject.java
ojluni/src/main/java/sun/nio/ch/FileLockImpl.java
ojluni/src/main/java/sun/nio/ch/Invoker.java
ojluni/src/main/java/sun/nio/ch/MembershipKeyImpl.java
ojluni/src/main/java/sun/nio/ch/MembershipRegistry.java
ojluni/src/main/java/sun/nio/ch/PipeImpl.java
ojluni/src/main/java/sun/nio/ch/PollSelectorProvider.java
ojluni/src/main/java/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java
Generated by tools/expected_upstream/ojluni_refresh_files.py
Test: N/A
Change-Id: If84ab2c57f92dcd17166048a0dcddc5aaa781c0f
diff --git a/ojluni/src/main/java/jdk/net/ExtendedSocketOptions.java b/ojluni/src/main/java/jdk/net/ExtendedSocketOptions.java
index f2a0be3..32323b6 100644
--- a/ojluni/src/main/java/jdk/net/ExtendedSocketOptions.java
+++ b/ojluni/src/main/java/jdk/net/ExtendedSocketOptions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,24 @@
package jdk.net;
+import java.io.FileDescriptor;
+import java.net.SocketException;
import java.net.SocketOption;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import jdk.internal.misc.JavaIOFileDescriptorAccess;
+import jdk.internal.misc.SharedSecrets;
/**
* Defines extended socket options, beyond those defined in
* {@link java.net.StandardSocketOptions}. These options may be platform
* specific.
+ *
+ * @since 1.8
*/
-@jdk.Exported
public final class ExtendedSocketOptions {
private static class ExtSocketOption<T> implements SocketOption<T> {
@@ -47,7 +57,7 @@
@Override public String toString() { return name; }
}
- private ExtendedSocketOptions() {}
+ private ExtendedSocketOptions() { }
/**
* Service level properties. When a security manager is installed,
@@ -57,4 +67,347 @@
*/
public static final SocketOption<SocketFlow> SO_FLOW_SLA = new
ExtSocketOption<SocketFlow>("SO_FLOW_SLA", SocketFlow.class);
+
+ /**
+ * Disable Delayed Acknowledgements.
+ *
+ * <p>
+ * This socket option can be used to reduce or disable delayed
+ * acknowledgments (ACKs). When {@code TCP_QUICKACK} is enabled, ACKs are
+ * sent immediately, rather than delayed if needed in accordance to normal
+ * TCP operation. This option is not permanent, it only enables a switch to
+ * or from {@code TCP_QUICKACK} mode. Subsequent operations of the TCP
+ * protocol will once again disable/enable {@code TCP_QUICKACK} mode
+ * depending on internal protocol processing and factors such as delayed ACK
+ * timeouts occurring and data transfer, therefore this option needs to be
+ * set with {@code setOption} after each operation of TCP on a given socket.
+ *
+ * <p>
+ * The value of this socket option is a {@code Boolean} that represents
+ * whether the option is enabled or disabled. The socket option is specific
+ * to stream-oriented sockets using the TCP/IP protocol. The exact semantics
+ * of this socket option are socket type and system dependent.
+ *
+ * @since 10
+ */
+ public static final SocketOption<Boolean> TCP_QUICKACK =
+ new ExtSocketOption<Boolean>("TCP_QUICKACK", Boolean.class);
+
+ /**
+ * Keep-Alive idle time.
+ *
+ * <p>
+ * The value of this socket option is an {@code Integer} that is the number
+ * of seconds of idle time before keep-alive initiates a probe. The socket
+ * option is specific to stream-oriented sockets using the TCP/IP protocol.
+ * The exact semantics of this socket option are system dependent.
+ *
+ * <p>
+ * When the {@link java.net.StandardSocketOptions#SO_KEEPALIVE
+ * SO_KEEPALIVE} option is enabled, TCP probes a connection that has been
+ * idle for some amount of time. The default value for this idle period is
+ * system dependent, but is typically 2 hours. The {@code TCP_KEEPIDLE}
+ * option can be used to affect this value for a given socket.
+ *
+ * @since 11
+ */
+ public static final SocketOption<Integer> TCP_KEEPIDLE
+ = new ExtSocketOption<Integer>("TCP_KEEPIDLE", Integer.class);
+
+ /**
+ * Keep-Alive retransmission interval time.
+ *
+ * <p>
+ * The value of this socket option is an {@code Integer} that is the number
+ * of seconds to wait before retransmitting a keep-alive probe. The socket
+ * option is specific to stream-oriented sockets using the TCP/IP protocol.
+ * The exact semantics of this socket option are system dependent.
+ *
+ * <p>
+ * When the {@link java.net.StandardSocketOptions#SO_KEEPALIVE
+ * SO_KEEPALIVE} option is enabled, TCP probes a connection that has been
+ * idle for some amount of time. If the remote system does not respond to a
+ * keep-alive probe, TCP retransmits the probe after some amount of time.
+ * The default value for this retransmission interval is system dependent,
+ * but is typically 75 seconds. The {@code TCP_KEEPINTERVAL} option can be
+ * used to affect this value for a given socket.
+ *
+ * @since 11
+ */
+ public static final SocketOption<Integer> TCP_KEEPINTERVAL
+ = new ExtSocketOption<Integer>("TCP_KEEPINTERVAL", Integer.class);
+
+ /**
+ * Keep-Alive retransmission maximum limit.
+ *
+ * <p>
+ * The value of this socket option is an {@code Integer} that is the maximum
+ * number of keep-alive probes to be sent. The socket option is specific to
+ * stream-oriented sockets using the TCP/IP protocol. The exact semantics of
+ * this socket option are system dependent.
+ *
+ * <p>
+ * When the {@link java.net.StandardSocketOptions#SO_KEEPALIVE
+ * SO_KEEPALIVE} option is enabled, TCP probes a connection that has been
+ * idle for some amount of time. If the remote system does not respond to a
+ * keep-alive probe, TCP retransmits the probe a certain number of times
+ * before a connection is considered to be broken. The default value for
+ * this keep-alive probe retransmit limit is system dependent, but is
+ * typically 8. The {@code TCP_KEEPCOUNT} option can be used to affect this
+ * value for a given socket.
+ *
+ * @since 11
+ */
+ public static final SocketOption<Integer> TCP_KEEPCOUNT
+ = new ExtSocketOption<Integer>("TCP_KEEPCOUNT", Integer.class);
+
+ private static final PlatformSocketOptions platformSocketOptions =
+ PlatformSocketOptions.get();
+
+ private static final boolean flowSupported =
+ platformSocketOptions.flowSupported();
+ private static final boolean quickAckSupported =
+ platformSocketOptions.quickAckSupported();
+ private static final boolean keepAliveOptSupported =
+ platformSocketOptions.keepAliveOptionsSupported();
+ private static final Set<SocketOption<?>> extendedOptions = options();
+
+ static Set<SocketOption<?>> options() {
+ Set<SocketOption<?>> options = new HashSet<>();
+ if (flowSupported) {
+ options.add(SO_FLOW_SLA);
+ }
+ if (quickAckSupported) {
+ options.add(TCP_QUICKACK);
+ }
+ if (keepAliveOptSupported) {
+ options.addAll(Set.of(TCP_KEEPCOUNT, TCP_KEEPIDLE, TCP_KEEPINTERVAL));
+ }
+ return Collections.unmodifiableSet(options);
+ }
+
+ static {
+ // Registers the extended socket options with the base module.
+ sun.net.ext.ExtendedSocketOptions.register(
+ new sun.net.ext.ExtendedSocketOptions(extendedOptions) {
+
+ @Override
+ public void setOption(FileDescriptor fd,
+ SocketOption<?> option,
+ Object value)
+ throws SocketException
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null)
+ sm.checkPermission(new NetworkPermission("setOption." + option.name()));
+
+ if (fd == null || !fd.valid())
+ throw new SocketException("socket closed");
+
+ if (option == SO_FLOW_SLA) {
+ assert flowSupported;
+ SocketFlow flow = checkValueType(value, option.type());
+ setFlowOption(fd, flow);
+ } else if (option == TCP_QUICKACK) {
+ setQuickAckOption(fd, (boolean) value);
+ } else if (option == TCP_KEEPCOUNT) {
+ setTcpkeepAliveProbes(fd, (Integer) value);
+ } else if (option == TCP_KEEPIDLE) {
+ setTcpKeepAliveTime(fd, (Integer) value);
+ } else if (option == TCP_KEEPINTERVAL) {
+ setTcpKeepAliveIntvl(fd, (Integer) value);
+ } else {
+ throw new InternalError("Unexpected option " + option);
+ }
+ }
+
+ @Override
+ public Object getOption(FileDescriptor fd,
+ SocketOption<?> option)
+ throws SocketException
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null)
+ sm.checkPermission(new NetworkPermission("getOption." + option.name()));
+
+ if (fd == null || !fd.valid())
+ throw new SocketException("socket closed");
+
+ if (option == SO_FLOW_SLA) {
+ assert flowSupported;
+ SocketFlow flow = SocketFlow.create();
+ getFlowOption(fd, flow);
+ return flow;
+ } else if (option == TCP_QUICKACK) {
+ return getQuickAckOption(fd);
+ } else if (option == TCP_KEEPCOUNT) {
+ return getTcpkeepAliveProbes(fd);
+ } else if (option == TCP_KEEPIDLE) {
+ return getTcpKeepAliveTime(fd);
+ } else if (option == TCP_KEEPINTERVAL) {
+ return getTcpKeepAliveIntvl(fd);
+ } else {
+ throw new InternalError("Unexpected option " + option);
+ }
+ }
+ });
+ }
+
+ @SuppressWarnings("unchecked")
+ private static <T> T checkValueType(Object value, Class<?> type) {
+ if (!type.isAssignableFrom(value.getClass())) {
+ String s = "Found: " + value.getClass() + ", Expected: " + type;
+ throw new IllegalArgumentException(s);
+ }
+ return (T) value;
+ }
+
+ private static final JavaIOFileDescriptorAccess fdAccess =
+ SharedSecrets.getJavaIOFileDescriptorAccess();
+
+ private static void setFlowOption(FileDescriptor fd, SocketFlow f)
+ throws SocketException
+ {
+ int status = platformSocketOptions.setFlowOption(fdAccess.get(fd),
+ f.priority(),
+ f.bandwidth());
+ f.status(status); // augment the given flow with the status
+ }
+
+ private static void getFlowOption(FileDescriptor fd, SocketFlow f)
+ throws SocketException {
+ int status = platformSocketOptions.getFlowOption(fdAccess.get(fd), f);
+ f.status(status); // augment the given flow with the status
+ }
+
+ private static void setQuickAckOption(FileDescriptor fd, boolean enable)
+ throws SocketException {
+ platformSocketOptions.setQuickAck(fdAccess.get(fd), enable);
+ }
+
+ private static Object getQuickAckOption(FileDescriptor fd)
+ throws SocketException {
+ return platformSocketOptions.getQuickAck(fdAccess.get(fd));
+ }
+
+ private static void setTcpkeepAliveProbes(FileDescriptor fd, int value)
+ throws SocketException {
+ platformSocketOptions.setTcpkeepAliveProbes(fdAccess.get(fd), value);
+ }
+
+ private static void setTcpKeepAliveTime(FileDescriptor fd, int value)
+ throws SocketException {
+ platformSocketOptions.setTcpKeepAliveTime(fdAccess.get(fd), value);
+ }
+
+ private static void setTcpKeepAliveIntvl(FileDescriptor fd, int value)
+ throws SocketException {
+ platformSocketOptions.setTcpKeepAliveIntvl(fdAccess.get(fd), value);
+ }
+
+ private static int getTcpkeepAliveProbes(FileDescriptor fd) throws SocketException {
+ return platformSocketOptions.getTcpkeepAliveProbes(fdAccess.get(fd));
+ }
+
+ private static int getTcpKeepAliveTime(FileDescriptor fd) throws SocketException {
+ return platformSocketOptions.getTcpKeepAliveTime(fdAccess.get(fd));
+ }
+
+ private static int getTcpKeepAliveIntvl(FileDescriptor fd) throws SocketException {
+ return platformSocketOptions.getTcpKeepAliveIntvl(fdAccess.get(fd));
+ }
+
+ static class PlatformSocketOptions {
+
+ protected PlatformSocketOptions() {}
+
+ @SuppressWarnings("unchecked")
+ private static PlatformSocketOptions newInstance(String cn) {
+ Class<PlatformSocketOptions> c;
+ try {
+ c = (Class<PlatformSocketOptions>)Class.forName(cn);
+ return c.getConstructor(new Class<?>[] { }).newInstance();
+ } catch (ReflectiveOperationException x) {
+ throw new AssertionError(x);
+ }
+ }
+
+ private static PlatformSocketOptions create() {
+ String osname = AccessController.doPrivileged(
+ new PrivilegedAction<String>() {
+ public String run() {
+ return System.getProperty("os.name");
+ }
+ });
+ if ("SunOS".equals(osname)) {
+ return newInstance("jdk.net.SolarisSocketOptions");
+ } else if ("Linux".equals(osname)) {
+ return newInstance("jdk.net.LinuxSocketOptions");
+ } else if (osname.startsWith("Mac")) {
+ return newInstance("jdk.net.MacOSXSocketOptions");
+ } else {
+ return new PlatformSocketOptions();
+ }
+ }
+
+ private static final PlatformSocketOptions instance = create();
+
+ static PlatformSocketOptions get() {
+ return instance;
+ }
+
+ int setFlowOption(int fd, int priority, long bandwidth)
+ throws SocketException
+ {
+ throw new UnsupportedOperationException("unsupported socket option");
+ }
+
+ int getFlowOption(int fd, SocketFlow f) throws SocketException {
+ throw new UnsupportedOperationException("unsupported socket option");
+ }
+
+ boolean flowSupported() {
+ return false;
+ }
+
+ void setQuickAck(int fd, boolean on) throws SocketException {
+ throw new UnsupportedOperationException("unsupported TCP_QUICKACK option");
+ }
+
+ boolean getQuickAck(int fd) throws SocketException {
+ throw new UnsupportedOperationException("unsupported TCP_QUICKACK option");
+ }
+
+ boolean quickAckSupported() {
+ return false;
+ }
+
+ boolean keepAliveOptionsSupported() {
+ return false;
+ }
+
+ void setTcpkeepAliveProbes(int fd, final int value) throws SocketException {
+ throw new UnsupportedOperationException("unsupported TCP_KEEPCNT option");
+ }
+
+ void setTcpKeepAliveTime(int fd, final int value) throws SocketException {
+ throw new UnsupportedOperationException("unsupported TCP_KEEPIDLE option");
+ }
+
+ void setTcpKeepAliveIntvl(int fd, final int value) throws SocketException {
+ throw new UnsupportedOperationException("unsupported TCP_KEEPINTVL option");
+ }
+
+ int getTcpkeepAliveProbes(int fd) throws SocketException {
+ throw new UnsupportedOperationException("unsupported TCP_KEEPCNT option");
+ }
+
+ int getTcpKeepAliveTime(int fd) throws SocketException {
+ throw new UnsupportedOperationException("unsupported TCP_KEEPIDLE option");
+ }
+
+ int getTcpKeepAliveIntvl(int fd) throws SocketException {
+ throw new UnsupportedOperationException("unsupported TCP_KEEPINTVL option");
+ }
+ }
}
diff --git a/ojluni/src/main/java/sun/nio/ch/AllocatedNativeObject.java b/ojluni/src/main/java/sun/nio/ch/AllocatedNativeObject.java
index 2406cb8..6709ce1 100644
--- a/ojluni/src/main/java/sun/nio/ch/AllocatedNativeObject.java
+++ b/ojluni/src/main/java/sun/nio/ch/AllocatedNativeObject.java
@@ -36,14 +36,14 @@
{
/**
- * Allocates a memory area of at least <tt>size</tt> bytes outside of the
+ * Allocates a memory area of at least {@code size} bytes outside of the
* Java heap and creates a native object for that area.
*
* @param size
* Number of bytes to allocate
*
* @param pageAligned
- * If <tt>true</tt> then the area will be aligned on a hardware
+ * If {@code true} then the area will be aligned on a hardware
* page boundary
*
* @throws OutOfMemoryError
diff --git a/ojluni/src/main/java/sun/nio/ch/FileLockImpl.java b/ojluni/src/main/java/sun/nio/ch/FileLockImpl.java
index 05bc576..1b00761 100644
--- a/ojluni/src/main/java/sun/nio/ch/FileLockImpl.java
+++ b/ojluni/src/main/java/sun/nio/ch/FileLockImpl.java
@@ -31,7 +31,7 @@
public class FileLockImpl
extends FileLock
{
- private volatile boolean valid = true;
+ private volatile boolean invalid;
FileLockImpl(FileChannel channel, long position, long size, boolean shared)
{
@@ -44,25 +44,25 @@
}
public boolean isValid() {
- return valid;
+ return !invalid;
}
void invalidate() {
assert Thread.holdsLock(this);
- valid = false;
+ invalid = true;
}
public synchronized void release() throws IOException {
Channel ch = acquiredBy();
if (!ch.isOpen())
throw new ClosedChannelException();
- if (valid) {
+ if (isValid()) {
if (ch instanceof FileChannelImpl)
((FileChannelImpl)ch).release(this);
else if (ch instanceof AsynchronousFileChannelImpl)
((AsynchronousFileChannelImpl)ch).release(this);
else throw new AssertionError();
- valid = false;
+ invalidate();
}
}
}
diff --git a/ojluni/src/main/java/sun/nio/ch/Invoker.java b/ojluni/src/main/java/sun/nio/ch/Invoker.java
index 22908f0..d843600 100644
--- a/ojluni/src/main/java/sun/nio/ch/Invoker.java
+++ b/ojluni/src/main/java/sun/nio/ch/Invoker.java
@@ -29,6 +29,7 @@
import java.util.concurrent.*;
import java.security.AccessController;
import sun.security.action.GetIntegerAction;
+import jdk.internal.misc.InnocuousThread;
/**
* Defines static methods to invoke a completion handler or arbitrary task.
@@ -134,9 +135,9 @@
// clear thread locals when in default thread pool
if (System.getSecurityManager() != null) {
Thread me = Thread.currentThread();
- if (me instanceof sun.misc.InnocuousThread) {
+ if (me instanceof InnocuousThread) {
GroupAndInvokeCount thisGroupAndInvokeCount = myGroupAndInvokeCount.get();
- ((sun.misc.InnocuousThread)me).eraseThreadLocals();
+ ((InnocuousThread)me).eraseThreadLocals();
if (thisGroupAndInvokeCount != null) {
myGroupAndInvokeCount.set(thisGroupAndInvokeCount);
}
diff --git a/ojluni/src/main/java/sun/nio/ch/MembershipKeyImpl.java b/ojluni/src/main/java/sun/nio/ch/MembershipKeyImpl.java
index 5ecc396..46d6536 100644
--- a/ojluni/src/main/java/sun/nio/ch/MembershipKeyImpl.java
+++ b/ojluni/src/main/java/sun/nio/ch/MembershipKeyImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,11 @@
package sun.nio.ch;
-import java.nio.channels.*;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.io.IOException;
+import java.nio.channels.MembershipKey;
+import java.nio.channels.MulticastChannel;
import java.util.HashSet;
/**
@@ -43,11 +44,10 @@
private final NetworkInterface interf;
private final InetAddress source;
- // true when key is valid
- private volatile boolean valid = true;
+ private volatile boolean invalid;
// lock used when creating or accessing blockedSet
- private Object stateLock = new Object();
+ private final Object stateLock = new Object();
// set of source addresses that are blocked
private HashSet<InetAddress> blockedSet;
@@ -134,12 +134,12 @@
}
public boolean isValid() {
- return valid;
+ return !invalid;
}
// package-private
void invalidate() {
- valid = false;
+ invalid = true;
}
public void drop() {
@@ -184,7 +184,7 @@
// created blocked set if required and add source address
if (blockedSet == null)
- blockedSet = new HashSet<InetAddress>();
+ blockedSet = new HashSet<>();
blockedSet.add(toBlock);
}
return this;
diff --git a/ojluni/src/main/java/sun/nio/ch/MembershipRegistry.java b/ojluni/src/main/java/sun/nio/ch/MembershipRegistry.java
index 6607fc8..9f01c51 100644
--- a/ojluni/src/main/java/sun/nio/ch/MembershipRegistry.java
+++ b/ojluni/src/main/java/sun/nio/ch/MembershipRegistry.java
@@ -84,13 +84,13 @@
InetAddress group = key.group();
List<MembershipKeyImpl> keys;
if (groups == null) {
- groups = new HashMap<InetAddress,List<MembershipKeyImpl>>();
+ groups = new HashMap<>();
keys = null;
} else {
keys = groups.get(group);
}
if (keys == null) {
- keys = new LinkedList<MembershipKeyImpl>();
+ keys = new LinkedList<>();
groups.put(group, keys);
}
keys.add(key);
diff --git a/ojluni/src/main/java/sun/nio/ch/PipeImpl.java b/ojluni/src/main/java/sun/nio/ch/PipeImpl.java
index 0e8a549..f4ef6ce 100644
--- a/ojluni/src/main/java/sun/nio/ch/PipeImpl.java
+++ b/ojluni/src/main/java/sun/nio/ch/PipeImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@
private final SourceChannel source;
private final SinkChannel sink;
- PipeImpl(SelectorProvider sp) {
+ PipeImpl(SelectorProvider sp) throws IOException {
long pipeFds = IOUtil.makePipe(true);
int readFd = (int) (pipeFds >>> 32);
int writeFd = (int) pipeFds;
diff --git a/ojluni/src/main/java/sun/nio/ch/PollSelectorProvider.java b/ojluni/src/main/java/sun/nio/ch/PollSelectorProvider.java
index 8570774..9b38350 100644
--- a/ojluni/src/main/java/sun/nio/ch/PollSelectorProvider.java
+++ b/ojluni/src/main/java/sun/nio/ch/PollSelectorProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,8 @@
package sun.nio.ch;
import java.io.IOException;
-import java.nio.channels.*;
-import java.nio.channels.spi.*;
+import java.nio.channels.Channel;
+import java.nio.channels.spi.AbstractSelector;
public class PollSelectorProvider
extends SelectorProviderImpl
diff --git a/ojluni/src/main/java/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java b/ojluni/src/main/java/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java
index 8c7cfd2..74003b1 100644
--- a/ojluni/src/main/java/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java
+++ b/ojluni/src/main/java/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java
@@ -43,7 +43,7 @@
extends AsynchronousServerSocketChannelImpl
implements Port.PollableChannel
{
- private final static NativeDispatcher nd = new SocketDispatcher();
+ private static final NativeDispatcher nd = new SocketDispatcher();
private final Port port;
private final int fdVal;
@@ -216,7 +216,7 @@
// permission check must always be in initiator's context
try {
if (acc != null) {
- AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ AccessController.doPrivileged(new PrivilegedAction<>() {
public Void run() {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
@@ -287,7 +287,7 @@
synchronized (updateLock) {
if (handler == null) {
this.acceptHandler = null;
- result = new PendingFuture<AsynchronousSocketChannel,Object>(this);
+ result = new PendingFuture<>(this);
this.acceptFuture = result;
} else {
this.acceptHandler = handler;