changeset 1700:179b696beb69

RT-24554: Mac: Remove workaround for RT-19600
author kcr
date Wed, 29 Aug 2012 20:17:08 -0700
parents 7a0b0ca81d0b
children aafe86217491 b19f2b7dc9c2
files javafx-ui-common/src/com/sun/javafx/application/LauncherImpl.java
diffstat 1 files changed, 0 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-common/src/com/sun/javafx/application/LauncherImpl.java	Tue Aug 28 16:03:14 2012 -0700
+++ b/javafx-ui-common/src/com/sun/javafx/application/LauncherImpl.java	Wed Aug 29 20:17:08 2012 -0700
@@ -347,33 +347,6 @@
                 });
             }
 
-            // RT-19600: workaround for Mac crash on exit with J2D pipeline
-            boolean isMac = PlatformUtil.isMac();
-            if (isMac) {
-                // Exit if using the J2D pipeline. Note that currently SCENE3D
-                // is false only if we are running the J2D pipeline.
-                boolean exitOnClose = !PlatformImpl.isSupported(ConditionalFeature.SCENE3D);
-                boolean keepAlive = AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
-                    @Override public Boolean run() {
-                        return Boolean.getBoolean("javafx.keepalive");
-                    }
-                });
-                if (exitOnClose && !keepAlive) {
-                    if (constructorError != null) {
-                        constructorError.printStackTrace();
-                    } else if (initError != null) {
-                        initError.printStackTrace();
-                    } else if(startError != null) {
-                        startError.printStackTrace();
-                    } else if (stopError != null) {
-                        stopError.printStackTrace();
-                    }
-                    System.err.println("JavaFX application launcher: calling System.exit");
-                    System.exit(0);
-                }
-            }
-            // END OF WORKAROUND
-
             if (error) {
                 if (pConstructorError != null) {
                     throw new RuntimeException("Unable to construct Preloader instance: "