Skip to content

Commit 5589573

Browse files
committed
Cleanup some Class generifications
1 parent f8fedd0 commit 5589573

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

‎btrace-agent/src/main/java/org/openjdk/btrace/agent/Client.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -451,11 +451,11 @@ private BTraceProbe load(byte[] buf, ArgsMap args, boolean canLoadPack) {
451451
void retransformLoaded() throws UnmodifiableClassException {
452452
if (runtime != null) {
453453
if (probe.isTransforming() && settings.isRetransformStartup()) {
454-
ArrayList<Class> list = new ArrayList<>();
454+
ArrayList<Class<?>> list = new ArrayList<>();
455455
debugPrint("retransforming loaded classes");
456456
debugPrint("filtering loaded classes");
457457
ClassCache cc = ClassCache.getInstance();
458-
for (Class c : inst.getAllLoadedClasses()) {
458+
for (Class<?> c : inst.getAllLoadedClasses()) {
459459
if (c != null) {
460460
if (inst.isModifiableClass(c) && isCandidate(c)) {
461461
debugPrint("candidate " + c + " added");
@@ -466,11 +466,11 @@ void retransformLoaded() throws UnmodifiableClassException {
466466
list.trimToSize();
467467
int size = list.size();
468468
if (size > 0) {
469-
Class[] classes = new Class[size];
469+
Class<?>[] classes = new Class[size];
470470
list.toArray(classes);
471471
startRetransformClasses(size);
472472
if (isDebug()) {
473-
for (Class c : classes) {
473+
for (Class<?> c : classes) {
474474
try {
475475
debugPrint("Attempting to retransform class: " + c.getName());
476476
inst.retransformClasses(c);

‎btrace-instr/src/main/java/org/openjdk/btrace/instr/ClassFilter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ public ClassFilter(Iterable<OnMethod> onMethods) {
9999
* Note that we can not use Class.isAssignableFrom because the other
100100
* type is specified by just name and not by Class object.
101101
*/
102-
public static boolean isSubTypeOf(Class clazz, String typeName) {
102+
public static boolean isSubTypeOf(Class<?> clazz, String typeName) {
103103
if (clazz == null) {
104104
return false;
105105
} else if (clazz.getName().equals(typeName)) {
106106
return true;
107107
} else {
108-
for (Class iface : clazz.getInterfaces()) {
108+
for (Class<?> iface : clazz.getInterfaces()) {
109109
if (isSubTypeOf(iface, typeName)) {
110110
return true;
111111
}

0 commit comments

Comments
 (0)