diff -r bd197b8eda21 -r c1568a2416a8 jdk/src/java.desktop/share/classes/java/awt/Window.java
--- a/jdk/src/java.desktop/share/classes/java/awt/Window.java	Fri Apr 17 16:57:30 2015 +0300
+++ b/jdk/src/java.desktop/share/classes/java/awt/Window.java	Fri Apr 17 17:01:24 2015 +0300
@@ -760,7 +760,7 @@
                 parent.addNotify();
             }
             if (peer == null) {
-                peer = getToolkit().createWindow(this);
+                peer = getComponentFactory().createWindow(this);
             }
             synchronized (allWindows) {
                 allWindows.add(this);