svn commit: r536675 - /incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java

[ivaynberg]

Author: ivaynberg
Date: Wed May  9 14:55:30 2007
New Revision: 536675

URL: http://svn.apache.org/viewvc?view=rev&rev=536675
Log:
WICKET-548

Modified:
    
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java

Modified: 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java?view=diff&rev=536675&r1=536674&r2=536675
==============================================================================
--- 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
 (original)
+++ 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
 Wed May  9 14:55:30 2007
@@ -855,7 +855,11 @@
                // Set child's parent
                component.setParent(this);
 
-               component.attach();
+               final Page page = findPage();
+               if (page != null && page.isAttached())
+               {
+                       component.attach();
+               }
 
                final IDebugSettings debugSettings = 
Application.get().getDebugSettings();
                if (debugSettings.getComponentUseCheck())
@@ -864,8 +868,6 @@
                                        "added")));
                }
 
-               // Tell the page a component was added
-               final Page page = findPage();
                if (page != null)
                {
                        page.componentAdded(component);