Skip to content

Commit 81e6a5a

Browse files
author
Mandy Chung
committedJan 26, 2021
[lworld] code cleanup reverting some old leftover change
1 parent a2e8c6b commit 81e6a5a

File tree

6 files changed

+10
-15
lines changed

6 files changed

+10
-15
lines changed
 

‎src/java.base/share/classes/java/lang/System.java

+1
Original file line numberDiff line numberDiff line change
@@ -2276,6 +2276,7 @@ public String newStringUTF8NoRepl(byte[] bytes, int off, int len) {
22762276
public byte[] getBytesUTF8NoRepl(String s) {
22772277
return StringCoding.getBytesUTF8NoRepl(s);
22782278
}
2279+
22792280
public void setCause(Throwable t, Throwable cause) {
22802281
t.setCause(cause);
22812282
}

‎src/java.base/share/classes/java/lang/reflect/AccessibleObject.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -305,23 +305,23 @@ private boolean checkCanSetAccessible(Class<?> caller,
305305
throw new IllegalCallerException(); // should not happen
306306
}
307307

308-
int modifiers;
309-
if (this instanceof Executable) {
310-
modifiers = ((Executable) this).getModifiers();
311-
} else {
312-
modifiers = ((Field) this).getModifiers();
313-
}
314-
315308
Module callerModule = caller.getModule();
316309
Module declaringModule = declaringClass.getModule();
317310

318311
if (callerModule == declaringModule) return true;
319312
if (callerModule == Object.class.getModule()) return true;
320313
if (!declaringModule.isNamed()) return true;
321314

315+
String pn = declaringClass.getPackageName();
316+
int modifiers;
317+
if (this instanceof Executable) {
318+
modifiers = ((Executable) this).getModifiers();
319+
} else {
320+
modifiers = ((Field) this).getModifiers();
321+
}
322+
322323
// class is public and package is exported to caller
323324
boolean isClassPublic = Modifier.isPublic(declaringClass.getModifiers());
324-
String pn = declaringClass.getPackageName();
325325
if (isClassPublic && declaringModule.isExported(pn, callerModule)) {
326326
// member is public
327327
if (Modifier.isPublic(modifiers)) {

‎src/java.base/share/classes/java/lang/reflect/Constructor.java

-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ Constructor<T> copy() {
177177
@CallerSensitive
178178
public void setAccessible(boolean flag) {
179179
AccessibleObject.checkPermission();
180-
181180
if (flag) {
182181
checkCanSetAccessible(Reflection.getCallerClass());
183182
}

‎src/java.base/share/classes/java/lang/reflect/Field.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,7 @@ Field copy() {
168168
@CallerSensitive
169169
public void setAccessible(boolean flag) {
170170
AccessibleObject.checkPermission();
171-
172-
if (flag) {
173-
checkCanSetAccessible(Reflection.getCallerClass());
174-
}
171+
if (flag) checkCanSetAccessible(Reflection.getCallerClass());
175172
setAccessible0(flag);
176173
}
177174

‎src/java.base/share/classes/java/lang/reflect/Method.java

-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ byte[] getAnnotationBytes() {
217217
/**
218218
* Returns the {@code Class} object representing the class or interface
219219
* that declares the method represented by this object.
220-
*
221220
*/
222221
@Override
223222
public Class<?> getDeclaringClass() {

‎src/java.base/share/classes/jdk/internal/reflect/MethodAccessorGenerator.java

-1
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,6 @@ private void emitInvoke() {
633633
count,
634634
count,
635635
typeSizeInStackSlots(returnType));
636-
637636
} else {
638637
cb.opc_invokevirtual(targetMethodRef,
639638
count,

0 commit comments

Comments
 (0)
Please sign in to comment.