From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Thu, 8 Mar 2007 15:22:09 +0000 (+0000)
Subject: DIV Windows: Fixed null pointer exception when creating window
X-Git-Tag: 6.7.0.beta1~6543
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bd681f8b560e0cb91f77a1fccb331c90ea64fab5;p=vaadin-framework.git

DIV Windows: Fixed null pointer exception when creating window

svn changeset:832/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/web/AjaxApplicationManager.java b/src/com/itmill/toolkit/terminal/web/AjaxApplicationManager.java
index eddb44758b..4662b4bd39 100644
--- a/src/com/itmill/toolkit/terminal/web/AjaxApplicationManager.java
+++ b/src/com/itmill/toolkit/terminal/web/AjaxApplicationManager.java
@@ -253,6 +253,15 @@ public class AjaxApplicationManager implements Paintable.RepaintRequestListener,
                         for (Iterator i = currentPaintables.iterator(); i
                                 .hasNext();) {
                             Paintable p = (Paintable) i.next();
+                            
+                            
+                            // TODO CLEAN
+                            if (p instanceof Window) {
+                            	Window w = (Window)p;
+                            	if (w.getTerminal() == null)
+                            		w.setTerminal(application.getMainWindow().getTerminal());
+                            }
+                            
                             paintTarget.startTag("change");
                             paintTarget.addAttribute("format", "uidl");
                             String pid = getPaintableId(p);