Skip to content

Commit e338d65

Browse files
committed
rename ReferenceQueue.NULL to NULL_QUEUE
1 parent 17d04da commit e338d65

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceInternals.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public static <T> void setNextDiscovered(Reference<T> instance, Reference<?> new
161161
}
162162

163163
public static boolean hasQueue(Reference<?> instance) {
164-
return cast(instance).queue != Target_java_lang_ref_ReferenceQueue.NULL;
164+
return cast(instance).queue != Target_java_lang_ref_ReferenceQueue.NULL_QUEUE;
165165
}
166166

167167
/*
@@ -229,7 +229,7 @@ public static void processPendingReferences() {
229229
} else {
230230
@SuppressWarnings("unchecked")
231231
Target_java_lang_ref_ReferenceQueue<? super Object> queue = SubstrateUtil.cast(ref.queue, Target_java_lang_ref_ReferenceQueue.class);
232-
if (queue != Target_java_lang_ref_ReferenceQueue.NULL) {
232+
if (queue != Target_java_lang_ref_ReferenceQueue.NULL_QUEUE) {
233233
// Enqueues, avoiding the potentially overridden Reference.enqueue().
234234
queue.enqueue(ref);
235235
}

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_Reference.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public final class Target_java_lang_ref_Reference<T> {
119119
@Uninterruptible(reason = "The initialization of the fields must be atomic with respect to collection.")
120120
Target_java_lang_ref_Reference(T referent, Target_java_lang_ref_ReferenceQueue<? super T> queue) {
121121
this.referent = referent;
122-
this.queue = (queue == null) ? Target_java_lang_ref_ReferenceQueue.NULL : queue;
122+
this.queue = (queue == null) ? Target_java_lang_ref_ReferenceQueue.NULL_QUEUE : queue;
123123
}
124124

125125
@KeepOriginal

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_ReferenceQueue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
@TargetClass(ReferenceQueue.class)
3535
final class Target_java_lang_ref_ReferenceQueue<T> {
36-
@Alias static Target_java_lang_ref_ReferenceQueue<Object> NULL;
36+
@Alias static Target_java_lang_ref_ReferenceQueue<Object> NULL_QUEUE;
3737

3838
@Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset) //
3939
volatile Reference<? extends T> head;

0 commit comments

Comments
 (0)