Updated Branches:
  refs/heads/wicket-1.5.x 3caf81368 -> f5ba65c79

WICKET-4895 WicketRuntimeException: addOrReplace for feedback panel does not 
clear Component.FEEDBACK_LIST - feedback from replaced component causes error.


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f5ba65c7
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f5ba65c7
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f5ba65c7

Branch: refs/heads/wicket-1.5.x
Commit: f5ba65c794461ee67baeda1053a4ca9c5caf1b0e
Parents: 3caf813
Author: Martin Tzvetanov Grigorov <[email protected]>
Authored: Thu Nov 29 17:11:37 2012 +0100
Committer: Martin Tzvetanov Grigorov <[email protected]>
Committed: Thu Nov 29 17:14:26 2012 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/wicket/Component.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/f5ba65c7/wicket-core/src/main/java/org/apache/wicket/Component.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java 
b/wicket-core/src/main/java/org/apache/wicket/Component.java
index ca3d13a..0e78d83 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -2243,7 +2243,11 @@ public abstract class Component
                                Component[] feedbacksCopy = 
feedbacks.toArray(new Component[feedbacks.size()]);
                                for (Component feedback : feedbacksCopy)
                                {
-                                       feedback.internalBeforeRender();
+                                       // render it only if it is still in the 
page hierarchy (WICKET-4895)
+                                       if (feedback.findPage() != null)
+                                       {
+                                               feedback.internalBeforeRender();
+                                       }
                                }
                        }
                        getRequestCycle().setMetaData(FEEDBACK_LIST, null);

Reply via email to