diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-16 10:21:54 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-16 10:21:54 -0400 |
| commit | d83371dc720c76a53695fca06f86c81a3ca5b483 (patch) | |
| tree | a68fc63e1ec3e258df1e186b2ed57dcdc58cbc70 | |
| parent | 70397adb8f185ad50e131f050103dc99110fe818 (diff) | |
| parent | 2f36ea9c5745cccbd30d8fd4be0213bbaa85a3f9 (diff) | |
| download | libcore-d83371dc720c76a53695fca06f86c81a3ca5b483.zip libcore-d83371dc720c76a53695fca06f86c81a3ca5b483.tar.gz libcore-d83371dc720c76a53695fca06f86c81a3ca5b483.tar.bz2 | |
Merge change 25156
* changes:
Phantom fun.
| -rw-r--r-- | luni-kernel/src/main/java/java/lang/ref/Reference.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/luni-kernel/src/main/java/java/lang/ref/Reference.java b/luni-kernel/src/main/java/java/lang/ref/Reference.java index ca7290b..c695830 100644 --- a/luni-kernel/src/main/java/java/lang/ref/Reference.java +++ b/luni-kernel/src/main/java/java/lang/ref/Reference.java @@ -49,7 +49,7 @@ public abstract class Reference<T> { * VM requirement: this field <em>must</em> be called "referent" * and be an object. */ - T referent; + volatile T referent; /** * If non-null, the queue on which this reference will be enqueued @@ -58,7 +58,7 @@ public abstract class Reference<T> { * and be a java.lang.ref.ReferenceQueue. */ @SuppressWarnings("unchecked") - ReferenceQueue queue; + volatile ReferenceQueue queue; /** * Used internally by java.lang.ref.ReferenceQueue. @@ -66,7 +66,7 @@ public abstract class Reference<T> { * and be a java.lang.ref.Reference. */ @SuppressWarnings("unchecked") - Reference queueNext; + volatile Reference queueNext; /** * Used internally by Dalvik. @@ -74,7 +74,7 @@ public abstract class Reference<T> { * and be an int. */ @SuppressWarnings("unused") - private int vmData; + volatile private int vmData; /** * Constructs a new instance of this class. |