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

8263233: Update java.net and java.nio to use instanceof pattern variable

Browse source 
Reviewed-by: dfuchs, bpb, chegar, michaelm
This commit is contained in:
Patrick Concannon 2021-03-10 11:05:29 +00:00
parent 3fe8a4661c
commit fdd3941121
17 changed files with 39 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/java.base/share/classes/java/net/Inet6Address.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2021, 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
@ -262,10 +262,9 @@ class Inet6Address extends InetAddress {
}
public boolean equals(Object o) {
if (! (o instanceof Inet6AddressHolder)) {
if (!(o instanceof Inet6AddressHolder that)) {
return false;
}
Inet6AddressHolder that = (Inet6AddressHolder)o;
return Arrays.equals(this.ipaddress, that.ipaddress);
}
@ -525,10 +524,9 @@ class Inet6Address extends InetAddress {
Enumeration<InetAddress> addresses = ifc.getInetAddresses();
while (addresses.hasMoreElements()) {
InetAddress addr = addresses.nextElement();
if (!(addr instanceof Inet6Address)) {
if (!(addr instanceof Inet6Address ia6_addr)) {
continue;
}
Inet6Address ia6_addr = (Inet6Address)addr;
/* check if site or link local prefixes match */
if (!isDifferentLocalAddressType(thisAddr, ia6_addr.getAddress())){
/* type not the same, so carry on searching */