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

8289484: Cleanup unnecessary null comparison before instanceof check in java.rmi

Browse Source 
Reviewed-by: jpai, attila
This commit is contained in:
Andrey Turbanov 2022-07-04 20:21:11 +00:00
parent 9ccae7078e
commit df063f7db1
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/java.rmi/share/classes/java/rmi/MarshalledObject.java
View File

@ -213,8 +213,7 @@ public final class MarshalledObject<T> implements Serializable {
if (obj == this) if (obj == this)
return true; return true;
if (obj != null && obj instanceof MarshalledObject) { if (obj instanceof MarshalledObject<?> other) {
MarshalledObject<?> other = (MarshalledObject<?>) obj;
// if either is a ref to null, both must be // if either is a ref to null, both must be
if (objBytes == null || other.objBytes == null) if (objBytes == null || other.objBytes == null)

8
src/java.rmi/share/classes/sun/rmi/transport/LiveRef.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -178,8 +178,7 @@ public class LiveRef implements Cloneable {
} }
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj != null && obj instanceof LiveRef) { if (obj instanceof LiveRef ref) {
LiveRef ref = (LiveRef) obj;
return (ep.equals(ref.ep) && id.equals(ref.id) && return (ep.equals(ref.ep) && id.equals(ref.id) &&
isLocal == ref.isLocal); isLocal == ref.isLocal);
@ -189,8 +188,7 @@ public class LiveRef implements Cloneable {
} }
public boolean remoteEquals(Object obj) { public boolean remoteEquals(Object obj) {
if (obj != null && obj instanceof LiveRef) { if (obj instanceof LiveRef ref) {
LiveRef ref = (LiveRef) obj;
TCPEndpoint thisEp = ((TCPEndpoint) ep); TCPEndpoint thisEp = ((TCPEndpoint) ep);
TCPEndpoint refEp = ((TCPEndpoint) ref.ep); TCPEndpoint refEp = ((TCPEndpoint) ref.ep);

3
src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java
View File

@ -489,8 +489,7 @@ public class TCPEndpoint implements Endpoint {
} }
public boolean equals(Object obj) { public boolean equals(Object obj) {
if ((obj != null) && (obj instanceof TCPEndpoint)) { if (obj instanceof TCPEndpoint ep) {
TCPEndpoint ep = (TCPEndpoint) obj;
if (port != ep.port || !host.equals(ep.host)) if (port != ep.port || !host.equals(ep.host))
return false; return false;
if (((csf == null) ^ (ep.csf == null)) || if (((csf == null) ^ (ep.csf == null)) ||