stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8282917: Remove InetAddressImplFactory from InetAddress

Browse Source 
Reviewed-by: dfuchs, jpai
This commit is contained in:
Aleksei Efimov 2022-03-24 13:50:50 +00:00
parent 14c20bc0e0
commit 929b6a3556
4 changed files with 17 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/java.base/share/classes/java/net/InetAddress.java
View File

@ -412,6 +412,9 @@ public sealed class InetAddress implements Serializable permits Inet4Address, In
// Native method to check if IPv4 is available
private static native boolean isIPv4Available();
// Native method to check if IPv6 is available
private static native boolean isIPv6Supported();
/**
* The {@code RuntimePermission("inetAddressResolverProvider")} is
* necessary to subclass and instantiate the {@code InetAddressResolverProvider}
@ -1270,7 +1273,8 @@ public sealed class InetAddress implements Serializable permits Inet4Address, In
static {
// create the impl
impl = InetAddressImplFactory.create();
impl = isIPv6Supported() ?
new Inet6AddressImpl() : new Inet4AddressImpl();
// impl must be initialized before calling this method
PLATFORM_LOOKUP_POLICY = initializePlatformLookupPolicy();
@ -1826,16 +1830,3 @@ public sealed class InetAddress implements Serializable permits Inet4Address, In
s.writeFields();
}
}
/*
* Simple factory to create the impl
*/
class InetAddressImplFactory {
static InetAddressImpl create() {
return isIPv6Supported() ?
new Inet6AddressImpl() : new Inet4AddressImpl();
}
static native boolean isIPv6Supported();
}

13
src/java.base/share/native/libnet/InetAddress.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -76,8 +76,19 @@ Java_java_net_InetAddress_init(JNIEnv *env, jclass cls) {
/*
* Class: java_net_InetAddress
* Method: isIPv4Available
* Signature: ()Z
*/
JNIEXPORT jboolean JNICALL
Java_java_net_InetAddress_isIPv4Available(JNIEnv *env, jclass clazz) {
return ipv4_available();
}
/*
* Class: java_net_InetAddress
* Method: isIPv6Supported
* Signature: ()Z
*/
JNIEXPORT jboolean JNICALL
Java_java_net_InetAddress_isIPv6Supported(JNIEnv *env, jclass clazz) {
return ipv6_available();
}

46
src/java.base/unix/native/libnet/InetAddressImplFactory.c
View File

@ -1,46 +0,0 @@
/*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
#include "java_net_InetAddressImplFactory.h"
#include "net_util.h"
/************************************************************************
* InetAddressImplFactory
*/
/*
* Class: java_net_InetAddressImplFactory
* Method: isIPv6Supported
* Signature: ()I
*/
JNIEXPORT jboolean JNICALL
Java_java_net_InetAddressImplFactory_isIPv6Supported(JNIEnv *env, jclass cls) {
if (ipv6_available()) {
return JNI_TRUE;
} else {
return JNI_FALSE;
}
}

46
src/java.base/windows/native/libnet/InetAddressImplFactory.c
View File

@ -1,46 +0,0 @@
/*
* Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
#include "java_net_InetAddressImplFactory.h"
#include "net_util.h"
/*
* InetAddressImplFactory
*/
/*
* Class: java_net_InetAddressImplFactory
* Method: isIPv6Supported
* Signature: ()Z
*/
JNIEXPORT jboolean JNICALL
Java_java_net_InetAddressImplFactory_isIPv6Supported(JNIEnv *env, jobject this)
{
if (ipv6_available()) {
return JNI_TRUE;
} else {
return JNI_FALSE;
}
}