aboutsummaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin/ui/UI.java
diff options
context:
space:
mode:
authorJuuso Valli <juuso@vaadin.com>2014-09-11 16:34:03 +0300
committerSauli Tähkäpää <sauli@vaadin.com>2014-09-15 14:23:54 +0300
commit4a60f1a712787cfdadeddef399d177b25806017e (patch)
treea96434f9689e12c44d629cd33f7aa7168c5e489c /server/src/com/vaadin/ui/UI.java
parent85181e8f2905e3f1174538108fbc3e941946fd56 (diff)
downloadvaadin-framework-4a60f1a712787cfdadeddef399d177b25806017e.tar.gz
vaadin-framework-4a60f1a712787cfdadeddef399d177b25806017e.zip
Make Vaadin component handling proxy-friendly (#14639)
Comparisons with the ==-operator between a proxy and it's underlying instance fail, so we should use a custom equals method instead. Change-Id: Iaa86ae830fecbedfb1f55636e25f5affebf5aba3
Diffstat (limited to 'server/src/com/vaadin/ui/UI.java')
-rw-r--r--server/src/com/vaadin/ui/UI.java6
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;