diff options
Diffstat (limited to 'server/src/com/vaadin/ui/UI.java')
| -rw-r--r-- | server/src/com/vaadin/ui/UI.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java index 5abeea9480..d67e08828a 100644 --- a/server/src/com/vaadin/ui/UI.java +++ b/server/src/com/vaadin/ui/UI.java @@ -319,9 +319,9 @@ public abstract class UI extends AbstractSingleComponentContainer implements if (pendingFocus != null) { // ensure focused component is still attached to this main window - if (pendingFocus.getUI() == this - || (pendingFocus.getUI() != null && pendingFocus.getUI() - .getParent() == this)) { + if (equals(pendingFocus.getUI()) + || (pendingFocus.getUI() != null && equals(pendingFocus + .getUI().getParent()))) { target.addAttribute("focused", pendingFocus); } pendingFocus = null; |