Author: knopp
Date: Fri Mar 23 05:12:48 2007
New Revision: 521691

URL: http://svn.apache.org/viewvc?view=rev&rev=521691
Log:
Fixed situation when ajax header was left in page

Modified:
    
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/ajax/AjaxRequestTarget.java

Modified: 
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/ajax/AjaxRequestTarget.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/ajax/AjaxRequestTarget.java?view=diff&rev=521691&r1=521690&r2=521691
==============================================================================
--- 
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/ajax/AjaxRequestTarget.java
 (original)
+++ 
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/ajax/AjaxRequestTarget.java
 Fri Mar 23 05:12:48 2007
@@ -868,8 +868,9 @@
                }
 
                // add or replace the container to page
+               Component oldHeader = 
component.getPage().get(HtmlHeaderSectionHandler.HEADER_ID); 
                
-               if (component.getPage().get(HtmlHeaderSectionHandler.HEADER_ID) 
!= null)
+               if (oldHeader != null)
                {
                        component.getPage().replace(header);
                }
@@ -934,6 +935,11 @@
                }
 
                headerRendering = false;
+               
+               if (oldHeader == null)
+                       component.getPage().remove(header);
+               else
+                       component.getPage().replace(oldHeader);
        }
 
        /**


Reply via email to