--- old/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxyPeer.java	2015-03-04 18:16:17.000000000 +0300
+++ new/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxyPeer.java	2015-03-04 18:16:16.000000000 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -166,7 +166,6 @@
         XToolkit.postEvent(XToolkit.targetToAppContext(proxy), event);
     }
 
-    @SuppressWarnings("deprecation")
     boolean simulateMotifRequestFocus(Component lightweightChild, boolean temporary,
                                       boolean focusedWindowChangeAllowed, long time)
     {
@@ -174,7 +173,7 @@
             lightweightChild = (Component)proxy;
         }
         Component currentOwner = XKeyboardFocusManagerPeer.getInstance().getCurrentFocusOwner();
-        if (currentOwner != null && currentOwner.getPeer() == null) {
+        if (currentOwner != null && !currentOwner.isDisplayable()) {
             currentOwner = null;
         }
         FocusEvent  fg = new FocusEvent(lightweightChild, FocusEvent.FOCUS_GAINED, false, currentOwner );