svn commit: r1091876 - /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java

[pe...@apache.org]

Author: pete
Date: Wed Apr 13 18:35:00 2011
New Revision: 1091876

URL: http://svn.apache.org/viewvc?rev=1091876&view=rev
Log:
WICKET-3610: use Objects.equal instead of == for object comparison

Modified:
    wicket/trunk/wicket-core/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java?rev=1091876&r1=1091875&r2=1091876&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java Wed Apr 13 18:35:00 2011
@@ -16,7 +16,9 @@
  */
 package org.apache.wicket.feedback;
 
+import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.util.lang.Objects;
 
 /**
  * Filter for child-of relationship
@@ -50,14 +52,9 @@ public class ContainerFeedbackMessageFil
 	 */
 	public boolean accept(FeedbackMessage message)
 	{
-		if (message.getReporter() == null)
-		{
-			return false;
-		}
-		else
-		{
-			return container.contains(message.getReporter(), true) ||
-				container == message.getReporter();
-		}
+		final Component reporter = message.getReporter();
+
+		return reporter != null && 
+		       (container.contains(reporter, true) || Objects.equal(container, reporter));
 	}
 }