From cb6f82dbda365f63a691eb8ea548ff03bb74ae7d Mon Sep 17 00:00:00 2001 From: nathan Date: Fri, 18 Mar 2016 16:14:55 +0100 Subject: [PATCH] Reverted java7 NIO changes, since classloading fixes for java6 for Netty have been implemented --- .../barchart/udt/nio/SelectorProviderUDT.java | 6 --- .../udt/nio/ServerSocketChannelUDT.java | 28 -------------- .../barchart/udt/nio/SocketChannelUDT.java | 37 ------------------- 3 files changed, 71 deletions(-) diff --git a/src/com/barchart/udt/nio/SelectorProviderUDT.java b/src/com/barchart/udt/nio/SelectorProviderUDT.java index d30127d4..f36c6998 100644 --- a/src/com/barchart/udt/nio/SelectorProviderUDT.java +++ b/src/com/barchart/udt/nio/SelectorProviderUDT.java @@ -11,7 +11,6 @@ import com.barchart.udt.SocketUDT; import com.barchart.udt.TypeUDT; import java.io.IOException; -import java.net.ProtocolFamily; import java.nio.channels.DatagramChannel; import java.nio.channels.Pipe; import java.nio.channels.spi.SelectorProvider; @@ -137,9 +136,4 @@ public class SelectorProviderUDT extends SelectorProvider { public void setMaxSelectorSize(final int selectorSize) { maxSelectorSize = selectorSize; } - - @Override - public DatagramChannel openDatagramChannel(final ProtocolFamily family) throws IOException { - throw new UnsupportedOperationException("feature not available"); - } } diff --git a/src/com/barchart/udt/nio/ServerSocketChannelUDT.java b/src/com/barchart/udt/nio/ServerSocketChannelUDT.java index 6e333ef0..f66bda2a 100644 --- a/src/com/barchart/udt/nio/ServerSocketChannelUDT.java +++ b/src/com/barchart/udt/nio/ServerSocketChannelUDT.java @@ -14,10 +14,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; -import java.net.SocketAddress; -import java.net.SocketOption; import java.nio.channels.ServerSocketChannel; -import java.util.Set; /** * {@link ServerSocketChannel}-like wrapper for {@link SocketUDT} can be either @@ -139,29 +136,4 @@ public class ServerSocketChannelUDT extends ServerSocketChannel implements Chann public TypeUDT typeUDT() { return providerUDT().type(); } - - @Override - public ServerSocketChannel bind(final SocketAddress local, final int backlog) throws IOException { - throw new UnsupportedOperationException("feature not available"); - } - - @Override - public ServerSocketChannel setOption(final SocketOption name, final T value) throws IOException { - throw new UnsupportedOperationException("feature not available"); - } - - @Override - public T getOption(final SocketOption name) throws IOException { - throw new UnsupportedOperationException("feature not available"); - } - - @Override - public Set> supportedOptions() { - throw new UnsupportedOperationException("feature not available"); - } - - @Override - public SocketAddress getLocalAddress() throws IOException { - throw new UnsupportedOperationException("feature not available"); - } } diff --git a/src/com/barchart/udt/nio/SocketChannelUDT.java b/src/com/barchart/udt/nio/SocketChannelUDT.java index 9ac1c8f0..6fa4d6bf 100644 --- a/src/com/barchart/udt/nio/SocketChannelUDT.java +++ b/src/com/barchart/udt/nio/SocketChannelUDT.java @@ -17,14 +17,12 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.net.InetSocketAddress; import java.net.SocketAddress; -import java.net.SocketOption; import java.nio.ByteBuffer; import java.nio.channels.ClosedChannelException; import java.nio.channels.ConnectionPendingException; import java.nio.channels.IllegalBlockingModeException; import java.nio.channels.SocketChannel; import java.nio.channels.UnresolvedAddressException; -import java.util.Set; /** * {@link SocketChannel}-like wrapper for {@link SocketUDT}, can be either @@ -524,39 +522,4 @@ public class SocketChannelUDT extends SocketChannel implements ChannelUDT { return this; } - - @Override - public SocketAddress getRemoteAddress() throws IOException { - throw new UnsupportedOperationException("feature not available"); - } - - @Override - public SocketChannel setOption(final SocketOption name, final T value) throws IOException { - throw new UnsupportedOperationException("feature not available"); - } - - @Override - public T getOption(final SocketOption name) throws IOException { - throw new UnsupportedOperationException("feature not available"); - } - - @Override - public Set> supportedOptions() { - throw new UnsupportedOperationException("feature not available"); - } - - @Override - public SocketChannel shutdownInput() throws IOException { - throw new UnsupportedOperationException("feature not available"); - } - - @Override - public SocketChannel shutdownOutput() throws IOException { - throw new UnsupportedOperationException("feature not available"); - } - - @Override - public SocketAddress getLocalAddress() throws IOException { - throw new UnsupportedOperationException("feature not available"); - } }