Skip to content

Commit c1476fc

Browse files
committed
8366575: Remove SDP support
Reviewed-by: alanb, erikj, jpai, michaelm
1 parent 75e37b0 commit c1476fc

File tree

13 files changed

+0
-732
lines changed

13 files changed

+0
-732
lines changed

make/modules/java.base/Copy.gmk

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,6 @@ $(NET_PROPERTIES_DST): $(NET_PROPERTIES_SRCS)
145145

146146
TARGETS += $(NET_PROPERTIES_DST)
147147

148-
ifeq ($(call isTargetOs, linux), true)
149-
$(eval $(call SetupCopyFiles, COPY_SDP_CONF, \
150-
FILES := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/sdp/sdp.conf.template, \
151-
DEST := $(CONF_DST_DIR)/sdp, \
152-
))
153-
154-
TARGETS += $(COPY_SDP_CONF)
155-
endif
156-
157148
################################################################################
158149

159150
# JDK license and assembly exception files to be packaged in JMOD

src/java.base/share/classes/sun/net/sdp/SdpSupport.java

Lines changed: 0 additions & 78 deletions
This file was deleted.

src/java.base/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import java.util.concurrent.Future;
3939
import java.util.concurrent.locks.ReadWriteLock;
4040
import java.util.concurrent.locks.ReentrantReadWriteLock;
41-
import sun.net.NetHooks;
4241
import sun.net.ext.ExtendedSocketOptions;
4342

4443
/**
@@ -156,7 +155,6 @@ public final AsynchronousServerSocketChannel bind(SocketAddress local, int backl
156155
synchronized (stateLock) {
157156
if (localAddress != null)
158157
throw new AlreadyBoundException();
159-
NetHooks.beforeTcpBind(fd, isa.getAddress(), isa.getPort());
160158
Net.bind(fd, isa.getAddress(), isa.getPort());
161159
Net.listen(fd, backlog < 1 ? 50 : backlog);
162160
localAddress = Net.localAddress(fd);

src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import java.util.concurrent.locks.*;
4242
import jdk.internal.access.JavaNioAccess;
4343
import jdk.internal.access.SharedSecrets;
44-
import sun.net.NetHooks;
4544
import sun.net.ext.ExtendedSocketOptions;
4645

4746
/**
@@ -447,7 +446,6 @@ public final AsynchronousSocketChannel bind(SocketAddress local)
447446
throw new AlreadyBoundException();
448447
InetSocketAddress isa = (local == null) ?
449448
new InetSocketAddress(0) : Net.checkAddress(local);
450-
NetHooks.beforeTcpBind(fd, isa.getAddress(), isa.getPort());
451449
Net.bind(fd, isa.getAddress(), isa.getPort());
452450
localAddress = Net.localAddress(fd);
453451
}

src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
import jdk.internal.access.SharedSecrets;
5656
import jdk.internal.ref.CleanerFactory;
5757
import sun.net.ConnectionResetException;
58-
import sun.net.NetHooks;
5958
import sun.net.PlatformSocketImpl;
6059
import sun.net.ext.ExtendedSocketOptions;
6160
import jdk.internal.util.Exceptions;
@@ -501,11 +500,6 @@ private FileDescriptor beginConnect(InetAddress address, int port)
501500
}
502501
this.state = ST_CONNECTING;
503502

504-
// invoke beforeTcpConnect hook if not already bound
505-
if (localport == 0) {
506-
NetHooks.beforeTcpConnect(fd, address, port);
507-
}
508-
509503
// save the remote address/port
510504
this.address = address;
511505
this.port = port;
@@ -637,7 +631,6 @@ protected void bind(InetAddress host, int port) throws IOException {
637631
ensureOpen();
638632
if (localport != 0)
639633
throw new SocketException("Already bound");
640-
NetHooks.beforeTcpBind(fd, host, port);
641634
Net.bind(fd, host, port);
642635
// set the address field to the given host address to
643636
// maintain long standing behavior. When binding to 0.0.0.0

src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
import static java.net.StandardProtocolFamily.INET6;
5656
import static java.net.StandardProtocolFamily.UNIX;
5757

58-
import sun.net.NetHooks;
5958
import sun.net.ext.ExtendedSocketOptions;
6059

6160
/**
@@ -331,7 +330,6 @@ private SocketAddress netBind(SocketAddress local, int backlog) throws IOExcepti
331330
} else {
332331
isa = Net.checkAddress(local, family);
333332
}
334-
NetHooks.beforeTcpBind(fd, isa.getAddress(), isa.getPort());
335333
Net.bind(family, fd, isa.getAddress(), isa.getPort());
336334
Net.listen(fd, backlog < 1 ? 50 : backlog);
337335
return Net.localAddress(fd);

src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
import jdk.internal.event.SocketReadEvent;
6363
import jdk.internal.event.SocketWriteEvent;
6464
import sun.net.ConnectionResetException;
65-
import sun.net.NetHooks;
6665
import sun.net.ext.ExtendedSocketOptions;
6766
import jdk.internal.util.Exceptions;
6867

@@ -828,7 +827,6 @@ private SocketAddress netBind(SocketAddress local) throws IOException {
828827
} else {
829828
isa = Net.checkAddress(local, family);
830829
}
831-
NetHooks.beforeTcpBind(fd, isa.getAddress(), isa.getPort());
832830
Net.bind(family, fd, isa.getAddress(), isa.getPort());
833831
return Net.localAddress(fd);
834832
}
@@ -871,7 +869,6 @@ private void beginConnect(boolean blocking, SocketAddress sa)
871869

872870
if (isNetSocket() && (localAddress == null)) {
873871
InetSocketAddress isa = (InetSocketAddress) sa;
874-
NetHooks.beforeTcpConnect(fd, isa.getAddress(), isa.getPort());
875872
}
876873
remoteAddress = sa;
877874

src/java.base/unix/classes/sun/net/NetHooks.java

Lines changed: 0 additions & 96 deletions
This file was deleted.

0 commit comments

Comments
 (0)