OpenJDK / zgc / zgc
changeset 51265:d21a3d3aa4fb
8205397: InetAddress has wrong declaration for readObjectNoData
Reviewed-by: alanb, rriggs
| author | dfuchs |
|---|---|
| date | Wed, 27 Jun 2018 20:19:59 +0100 |
| parents | 3c45465c70ff |
| children | b970fae53807 |
| files | make/gensrc/Gensrc-jdk.hotspot.agent.gmk src/java.base/share/classes/java/net/InetAddress.java |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/make/gensrc/Gensrc-jdk.hotspot.agent.gmk Wed Jun 27 19:45:06 2018 +0200 +++ b/make/gensrc/Gensrc-jdk.hotspot.agent.gmk Wed Jun 27 20:19:59 2018 +0100 @@ -49,6 +49,7 @@ MACH_EXC_SERVER := $(MIG_OUTPUT_DIR)/mach_excServer.c $(MACH_EXC_SERVER): $(SDKROOT)/usr/include/mach/mach_exc.defs + $(call MakeTargetDir) $(MIG) -isysroot $(SDKROOT) -server $@ -user $(MACH_EXC_USER) \ -header $(MACH_EXC_HEADER) $(SDKROOT)/usr/include/mach/mach_exc.defs
--- a/src/java.base/share/classes/java/net/InetAddress.java Wed Jun 27 19:45:06 2018 +0200 +++ b/src/java.base/share/classes/java/net/InetAddress.java Wed Jun 27 20:19:59 2018 +0100 @@ -1709,7 +1709,7 @@ return (InetAddressImpl) impl; } - private void readObjectNoData (ObjectInputStream s) throws + private void readObjectNoData () throws IOException, ClassNotFoundException { if (getClass().getClassLoader() != null) { throw new SecurityException ("invalid address type");