1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
|
diff --git openjdk/jdk/make/com/sun/nio/sctp/Makefile openjdk/jdk/make/com/sun/nio/sctp/Makefile
index 4ae967f..fe669a9 100644
--- openjdk/jdk/make/com/sun/nio/sctp/Makefile
+++ openjdk/jdk/make/com/sun/nio/sctp/Makefile
@@ -64,11 +64,11 @@ ifneq ($(COMPILER_WARNINGS_FATAL),false)
COMPILER_WARNINGS_FATAL=true
endif
#OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -ldl
+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -ljavanet -lpthread -ldl
endif
ifeq ($(PLATFORM), solaris)
#LIBSCTP = -lsctp
-OTHER_LDLIBS += $(LIBSOCKET) -L$(LIBDIR)/$(LIBARCH) -lnet -lnio
+OTHER_LDLIBS += $(LIBSOCKET) -L$(LIBDIR)/$(LIBARCH) -ljavanet -lnio
endif # PLATFORM
else # windows
diff --git openjdk/jdk/make/java/net/Makefile openjdk/jdk/make/java/net/Makefile
index 7283e45..720f3d3 100644
--- openjdk/jdk/make/java/net/Makefile
+++ openjdk/jdk/make/java/net/Makefile
@@ -25,7 +25,7 @@
BUILDDIR = ../..
PACKAGE = java.net
-LIBRARY = net
+LIBRARY = javanet
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
diff --git openjdk/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile
index 191f17d..1e5f8e5 100644
--- openjdk/jdk/make/java/nio/Makefile
+++ openjdk/jdk/make/java/nio/Makefile
@@ -369,7 +369,7 @@ ifeq ($(PLATFORM),windows)
endif
ifeq ($(PLATFORM), linux)
- OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread $(LIBDL)
+ OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread $(LIBDL)
ifdef USE_SYSTEM_GIO
OTHER_LDLIBS += $(GIO_LIBS)
OTHER_INCLUDES += $(GIO_CFLAGS) -DUSE_SYSTEM_GIO
@@ -379,12 +379,12 @@ ifeq ($(PLATFORM), linux)
endif
ifeq ($(PLATFORM), macosx)
-OTHER_LDLIBS += -L$(LIBDIR) -ljava -lnet -pthread
+OTHER_LDLIBS += -L$(LIBDIR) -ljava -ljavanet -pthread
endif
ifeq ($(PLATFORM), solaris)
OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 $(LIBDL) -lsendfile \
- -L$(LIBDIR)/$(LIBARCH) -ljava -lnet
+ -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet
endif # PLATFORM
ifdef COMPILE_AGAINST_SYSCALLS
diff --git openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
index b7f0f2f..b093868 100644
--- openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
+++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
@@ -69,7 +69,7 @@ abstract class AbstractPlainDatagramSocketImpl extends DatagramSocketImpl
*/
static {
java.security.AccessController.doPrivileged(
- new sun.security.action.LoadLibraryAction("net"));
+ new sun.security.action.LoadLibraryAction("javanet"));
}
/**
diff --git openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
index c6a38ad..97de65b 100644
--- openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
+++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
@@ -78,7 +78,7 @@ abstract class AbstractPlainSocketImpl extends SocketImpl
*/
static {
java.security.AccessController.doPrivileged(
- new sun.security.action.LoadLibraryAction("net"));
+ new sun.security.action.LoadLibraryAction("javanet"));
}
/**
diff --git openjdk/jdk/src/share/classes/java/net/DatagramPacket.java openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
index 195ee86..6822a57 100644
--- openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
+++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
@@ -47,7 +47,7 @@ class DatagramPacket {
*/
static {
java.security.AccessController.doPrivileged(
- new sun.security.action.LoadLibraryAction("net"));
+ new sun.security.action.LoadLibraryAction("javanet"));
init();
}
diff --git openjdk/jdk/src/share/classes/java/net/InetAddress.java openjdk/jdk/src/share/classes/java/net/InetAddress.java
index 3ea28e4..7c78eae 100644
--- openjdk/jdk/src/share/classes/java/net/InetAddress.java
+++ openjdk/jdk/src/share/classes/java/net/InetAddress.java
@@ -260,7 +260,7 @@ class InetAddress implements java.io.Serializable {
static {
preferIPv6Address = java.security.AccessController.doPrivileged(
new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
- AccessController.doPrivileged(new LoadLibraryAction("net"));
+ AccessController.doPrivileged(new LoadLibraryAction("javanet"));
init();
}
diff --git openjdk/jdk/src/share/classes/java/net/NetworkInterface.java openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
index 6314d15..761fdda 100644
--- openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
+++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
@@ -53,7 +53,7 @@ public final class NetworkInterface {
private static final int defaultIndex; /* index of defaultInterface */
static {
- AccessController.doPrivileged(new LoadLibraryAction("net"));
+ AccessController.doPrivileged(new LoadLibraryAction("javanet"));
init();
defaultInterface = DefaultInterface.getDefault();
if (defaultInterface != null) {
diff --git openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java
index 5baca6e..befd0b9 100644
--- openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java
+++ openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java
@@ -76,6 +76,6 @@ public final class SdpSupport {
static {
AccessController.doPrivileged(
- new sun.security.action.LoadLibraryAction("net"));
+ new sun.security.action.LoadLibraryAction("javanet"));
}
}
diff --git openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
index d7aa358..9b2c719 100644
--- openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
+++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
@@ -95,7 +95,7 @@ public class DefaultProxySelector extends ProxySelector {
}});
if (b != null && b.booleanValue()) {
java.security.AccessController.doPrivileged(
- new sun.security.action.LoadLibraryAction("net"));
+ new sun.security.action.LoadLibraryAction("javanet"));
hasSystemProxies = init();
}
}
diff --git openjdk/jdk/src/share/classes/sun/nio/ch/Util.java openjdk/jdk/src/share/classes/sun/nio/ch/Util.java
index 10662df..34d441a 100644
--- openjdk/jdk/src/share/classes/sun/nio/ch/Util.java
+++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java
@@ -483,7 +483,7 @@ class Util {
return;
loaded = true;
java.security.AccessController
- .doPrivileged(new sun.security.action.LoadLibraryAction("net"));
+ .doPrivileged(new sun.security.action.LoadLibraryAction("javanet"));
java.security.AccessController
.doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
// IOUtil must be initialized; Its native methods are called from
diff --git openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
index 3695b5d..7c833cc 100644
--- openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
+++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
@@ -247,7 +247,7 @@ public class ResolverConfigurationImpl
static {
java.security.AccessController.doPrivileged(
- new sun.security.action.LoadLibraryAction("net"));
+ new sun.security.action.LoadLibraryAction("javanet"));
}
}
diff --git openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
index 7970885..46ab112 100644
--- openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
+++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
@@ -159,7 +159,7 @@ public class ResolverConfigurationImpl
static {
java.security.AccessController.doPrivileged(
- new sun.security.action.LoadLibraryAction("net"));
+ new sun.security.action.LoadLibraryAction("javanet"));
init0();
// start the address listener thread
|
