archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8205397: InetAddress has wrong declaration for readObjectNoData

Browse source 
Reviewed-by: alanb, rriggs
This commit is contained in:
Daniel Fuchs 2018-06-27 20:19:59 +01:00
parent 3a0cd3fcae
commit ed19b48e71
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
make/gensrc/Gensrc-jdk.hotspot.agent.gmk
View file

@ -49,6 +49,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
MACH_EXC_SERVER := $(MIG_OUTPUT_DIR)/mach_excServer.c MACH_EXC_SERVER := $(MIG_OUTPUT_DIR)/mach_excServer.c
$(MACH_EXC_SERVER): $(SDKROOT)/usr/include/mach/mach_exc.defs $(MACH_EXC_SERVER): $(SDKROOT)/usr/include/mach/mach_exc.defs
$(call MakeTargetDir)
$(MIG) -isysroot $(SDKROOT) -server $@ -user $(MACH_EXC_USER) \ $(MIG) -isysroot $(SDKROOT) -server $@ -user $(MACH_EXC_USER) \
-header $(MACH_EXC_HEADER) $(SDKROOT)/usr/include/mach/mach_exc.defs -header $(MACH_EXC_HEADER) $(SDKROOT)/usr/include/mach/mach_exc.defs

2
src/java.base/share/classes/java/net/InetAddress.java
View file

@ -1709,7 +1709,7 @@ class InetAddress implements java.io.Serializable {
return (InetAddressImpl) impl; return (InetAddressImpl) impl;
} }
private void readObjectNoData (ObjectInputStream s) throws private void readObjectNoData () throws
IOException, ClassNotFoundException { IOException, ClassNotFoundException {
if (getClass().getClassLoader() != null) { if (getClass().getClassLoader() != null) {
throw new SecurityException ("invalid address type"); throw new SecurityException ("invalid address type");