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 eddb44758b7953ebc947d44476eed444d77ccb44..4662b4bd399d834b2ec311b592ebf2cf41236d5f 100644 (file)
--- 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);