changeset 6737:23291ff6e7a7

Merge
author asaha
date Fri, 09 Aug 2013 07:41:54 -0700
parents e87be44883ad 06345027b0f7
children ff72fefa5b8c
files
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Aug 08 19:16:27 2013 +0200
+++ b/.hgtags	Fri Aug 09 07:41:54 2013 -0700
@@ -335,9 +335,11 @@
 0931b4a280b1e9b3b12936222d1bc6d427310f79 jdk7u40-b35
 cd7a4d0b218f98511068d8336aa3f4cbaf10b128 jdk7u40-b36
 04036faa7fc4ec11a268c190cf1712d19c77b4ba jdk7u40-b37
+070b277e1b43cc4b6a4e1ae419d1273970f718ed jdk7u40-b38
 55f01444cf58c8004df9a9634c1bd7ff87caa370 jdk7u25-b32
 b06abd965701459a868e88af9a3e564c0301971c jdk7u45-b01
 d23a877da2d5dad6520a268c83f183295a9e7299 jdk7u45-b02
 a56eb4f801232c409d34cd1190df4eec5fefe8a9 jdk7u45-b03
 702c8d83dd8c5b6c76fe53a694244a36d23fa860 jdk7u45-b04
 a70540e8a5e96773b83c7dc0accdb323d946c045 jdk7u45-b05
+f39399baf36761571719f6ff5dc69c514d97842d jdk7u45-b06
--- a/src/share/classes/sun/awt/AppContext.java	Thu Aug 08 19:16:27 2013 +0200
+++ b/src/share/classes/sun/awt/AppContext.java	Fri Aug 09 07:41:54 2013 -0700
@@ -309,11 +309,13 @@
                     // and excludes applets because by the time applet starts
                     // a number of contexts have already been created by the plugin.
                     if (numAppContexts.get() == 0) {
-                        // This check is not necessary, its purpose is to help
-                        // Plugin devs to catch all the cases of main AC creation.
                         if (System.getProperty("javaplugin.version") == null &&
                                 System.getProperty("javawebstart.version") == null) {
                             initMainAppContext();
+                        } else if (System.getProperty("javafx.version") != null &&
+                                threadGroup.getParent() != null) {
+                            // Swing inside JavaFX case
+                            SunToolkit.createNewAppContext();
                         }
                     }