summaryrefslogtreecommitdiff
path: root/test/2000-virtual-list-structural/AbstractCollection.patch
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2019-12-03 08:47:26 +0000
committer Nicolas Geoffray <ngeoffray@google.com> 2019-12-03 08:47:45 +0000
commit664999a12d6fc8a8ef5c0519b12ec1e8a51bb085 (patch)
treef4ae1b0844ac075807229db9695ead7dec07ff8a /test/2000-virtual-list-structural/AbstractCollection.patch
parent642af13b1b14794d8ab0db5cc82206213e648fa1 (diff)
Revert "Revert^2 "Allow structural redefinition on non-final classes.""
This reverts commit f1b809ce611e943f926fff97cefe0930226ffcc2. Reason for revert: Tests still fail Bug: 134162467 Bug: 144168550 Change-Id: Icdebc826b8630920b716afbfd6f338a29669fcc2
Diffstat (limited to 'test/2000-virtual-list-structural/AbstractCollection.patch')
-rw-r--r--test/2000-virtual-list-structural/AbstractCollection.patch16
1 files changed, 0 insertions, 16 deletions
diff --git a/test/2000-virtual-list-structural/AbstractCollection.patch b/test/2000-virtual-list-structural/AbstractCollection.patch
deleted file mode 100644
index 7507c7d862..0000000000
--- a/test/2000-virtual-list-structural/AbstractCollection.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../../../libcore/ojluni/src/main/java/java/util/AbstractCollection.java 2019-05-31 10:36:26.634361294 -0700
-+++ src-ex/java/util/AbstractCollection.java 2019-11-18 13:04:48.253575013 -0800
-@@ -63,7 +63,13 @@
- * Sole constructor. (For invocation by subclass constructors, typically
- * implicit.)
- */
-+ public static volatile int TOTAL_COUNT;
-+ public int cnt;
-+
- protected AbstractCollection() {
-+ synchronized (Collection.class) {
-+ cnt = ++TOTAL_COUNT;
-+ }
- }
-
- // Query Operations