src/solaris/classes/sun/awt/X11/XDecoratedPeer.java

@@ -1137,12 +1137,12 @@
             }
             Window realNativeFocusedWindow = XWindowPeer.getNativeFocusedWindow();
             focusLog.finest("Real native focused window: " + realNativeFocusedWindow +
                             "\nKFM's focused window: " + focusedWindow);
 
-            // See 6522725, 6613426.
-            if (target == realNativeFocusedWindow) {
+            // A workaround for Metacity. See 6522725, 6613426, 7147075.
+            if (target == realNativeFocusedWindow && XWM.getWMID() == XWM.METACITY_WM) {                
                 focusLog.fine("The window is already natively focused.");
                 return true;
             }
         }
         focusLog.fine("Requesting focus to " + (this == toFocus ? "this window" : toFocus));