8292305: [BACKOUT] JDK-8289208 Test DrawRotatedStringUsingRotatedFont…

….java occasionally crashes on MacOS

Reviewed-by: prr, dholmes

src/java.desktop/share/classes/sun/java2d/Disposer.java

@@ -33,8 +33,8 @@
 import java.lang.ref.WeakReference;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
+import java.util.ArrayList;
 import java.util.Hashtable;
-import java.util.concurrent.ConcurrentLinkedDeque;
 
 /**
  * This class is used for registering and disposing the native
@@ -145,12 +145,12 @@ public void run() {
                 Reference<?> obj = queue.remove();
                 obj.clear();
                 DisposerRecord rec = records.remove(obj);
-                safeDispose(rec);
+                rec.dispose();
                 obj = null;
                 rec = null;
                 clearDeferredRecords();
             } catch (Exception e) {
-                e.printStackTrace(System.err);
+                System.out.println("Exception while removing reference.");
             }
         }
     }
@@ -164,23 +164,21 @@ public void run() {
     public static interface PollDisposable {
     };
 
-    private static ConcurrentLinkedDeque<DisposerRecord> deferredRecords = new ConcurrentLinkedDeque<>();
-
-    private static void safeDispose(DisposerRecord rec) {
-        try {
-            rec.dispose();
-        } catch (final Exception e) {
-            e.printStackTrace(System.err);
-        }
-    }
+    private static ArrayList<DisposerRecord> deferredRecords = null;
 
     private static void clearDeferredRecords() {
-        while (!deferredRecords.isEmpty()) {
-            final DisposerRecord rec = deferredRecords.pollFirst();
-            if (rec != null) {
-                safeDispose(rec);
+        if (deferredRecords == null || deferredRecords.isEmpty()) {
+            return;
+        }
+        for (int i=0;i<deferredRecords.size(); i++) {
+            try {
+                DisposerRecord rec = deferredRecords.get(i);
+                rec.dispose();
+            } catch (Exception e) {
+                System.out.println("Exception while disposing deferred rec.");
             }
         }
+        deferredRecords.clear();
     }
 
     /*
@@ -213,19 +211,22 @@ public static void pollRemove() {
                 obj.clear();
                 DisposerRecord rec = records.remove(obj);
                 if (rec instanceof PollDisposable) {
-                    safeDispose(rec);
+                    rec.dispose();
                     obj = null;
                     rec = null;
                 } else {
                     if (rec == null) { // shouldn't happen, but just in case.
                         continue;
                     }
                     deferred++;
-                    deferredRecords.offerLast(rec);
+                    if (deferredRecords == null) {
+                      deferredRecords = new ArrayList<DisposerRecord>(5);
+                    }
+                    deferredRecords.add(rec);
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace(System.err);
+            System.out.println("Exception while removing reference.");
         } finally {
             pollingQueue = false;
         }

test/jdk/java/awt/Graphics2D/DrawString/DrawRotatedStringUsingRotatedFont.java

@@ -37,8 +37,7 @@
 
 /**
  * @test
- * @bug 8065373 8289208
- * @key headful
+ * @bug 8065373
  * @summary Verifies that we get correct direction, when draw rotated string.
  * @author Sergey Bylokhov
  * @run main DrawRotatedStringUsingRotatedFont