diff options
| author | Juuso Valli <juuso@vaadin.com> | 2014-09-11 16:34:03 +0300 |
|---|---|---|
| committer | Sauli Tähkäpää <sauli@vaadin.com> | 2014-09-15 14:23:54 +0300 |
| commit | 4a60f1a712787cfdadeddef399d177b25806017e (patch) | |
| tree | a96434f9689e12c44d629cd33f7aa7168c5e489c /server/src/com/vaadin/ui/AbstractSingleComponentContainer.java | |
| parent | 85181e8f2905e3f1174538108fbc3e941946fd56 (diff) | |
| download | vaadin-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/AbstractSingleComponentContainer.java')
| -rw-r--r-- | server/src/com/vaadin/ui/AbstractSingleComponentContainer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/src/com/vaadin/ui/AbstractSingleComponentContainer.java b/server/src/com/vaadin/ui/AbstractSingleComponentContainer.java index ba108fc302..e7b5205f2d 100644 --- a/server/src/com/vaadin/ui/AbstractSingleComponentContainer.java +++ b/server/src/com/vaadin/ui/AbstractSingleComponentContainer.java @@ -134,7 +134,7 @@ public abstract class AbstractSingleComponentContainer extends // do not set the same content twice return; } - if (oldContent != null && oldContent.getParent() == this) { + if (oldContent != null && equals(oldContent.getParent())) { oldContent.setParent(null); fireComponentDetachEvent(oldContent); } |