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

8265418: Clean-up redundant null-checks of Class.getPackageName()

Browse source 
Reviewed-by: redestad
This commit is contained in:
Сергей Цыпанов 2021-05-27 20:21:34 +00:00 • committed by Claes Redestad
parent 41185d38f2
commit ae258f1e6a
8 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.base/share/classes/java/io/ObjectStreamClass.java
View file

@ -1673,8 +1673,8 @@ public class ObjectStreamClass implements Serializable {
* otherwise.
*/
private static boolean packageEquals(Class<?> cl1, Class<?> cl2) {
return (cl1.getClassLoader() == cl2.getClassLoader() &&
cl1.getPackageName().equals(cl2.getPackageName()));
return cl1.getClassLoader() == cl2.getClassLoader() &&
cl1.getPackageName() == cl2.getPackageName();
}
/**

6
src/java.base/share/classes/java/lang/Class.java
View file

@ -3043,7 +3043,7 @@ public final class Class<T> implements java.io.Serializable,
if (ReflectUtil.needsPackageAccessCheck(ccl, cl)) {
String pkg = this.getPackageName();
if (pkg != null && !pkg.isEmpty()) {
if (!pkg.isEmpty()) {
// skip the package access check on a proxy class in default proxy package
if (!Proxy.isProxyClass(this) || ReflectUtil.isNonPublicProxyClass(this)) {
sm.checkPackageAccess(pkg);
@ -3077,7 +3077,7 @@ public final class Class<T> implements java.io.Serializable,
if (Proxy.isProxyClass(c))
throw new InternalError("a permitted subclass should not be a proxy class: " + c);
String pkg = c.getPackageName();
if (pkg != null && !pkg.isEmpty()) {
if (!pkg.isEmpty()) {
packages.add(pkg);
}
}
@ -3094,7 +3094,7 @@ public final class Class<T> implements java.io.Serializable,
private String resolveName(String name) {
if (!name.startsWith("/")) {
String baseName = getPackageName();
if (baseName != null && !baseName.isEmpty()) {
if (!baseName.isEmpty()) {
int len = baseName.length() + 1 + name.length();
StringBuilder sb = new StringBuilder(len);
name = sb.append(baseName.replace('.', '/'))

3
src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
View file

@ -40,7 +40,6 @@ import java.lang.reflect.Modifier;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.Objects;
import java.util.function.IntBinaryOperator;
import java.util.function.IntUnaryOperator;
import jdk.internal.misc.Unsafe;
@ -456,7 +455,7 @@ public abstract class AtomicIntegerFieldUpdater<T> {
*/
private static boolean isSamePackage(Class<?> class1, Class<?> class2) {
return class1.getClassLoader() == class2.getClassLoader()
&& Objects.equals(class1.getPackageName(), class2.getPackageName());
&& class1.getPackageName() == class2.getPackageName();
}
/**

3
src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
View file

@ -40,7 +40,6 @@ import java.lang.reflect.Modifier;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.Objects;
import java.util.function.LongBinaryOperator;
import java.util.function.LongUnaryOperator;
import jdk.internal.misc.Unsafe;
@ -656,6 +655,6 @@ public abstract class AtomicLongFieldUpdater<T> {
*/
static boolean isSamePackage(Class<?> class1, Class<?> class2) {
return class1.getClassLoader() == class2.getClassLoader()
&& Objects.equals(class1.getPackageName(), class2.getPackageName());
&& class1.getPackageName() == class2.getPackageName();
}
}

3
src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
View file

@ -40,7 +40,6 @@ import java.lang.reflect.Modifier;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.Objects;
import java.util.function.BinaryOperator;
import java.util.function.UnaryOperator;
import jdk.internal.misc.Unsafe;
@ -397,7 +396,7 @@ public abstract class AtomicReferenceFieldUpdater<T,V> {
*/
private static boolean isSamePackage(Class<?> class1, Class<?> class2) {
return class1.getClassLoader() == class2.getClassLoader()
&& Objects.equals(class1.getPackageName(), class2.getPackageName());
&& class1.getPackageName() == class2.getPackageName();
}
/**