You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/01/17 10:20:11 UTC

[2/2] git commit: Move the check for non-null earlier in the method body. It would throw NPE in #checkHierarchyChange() otherwise.

Updated Branches:
  refs/heads/master e37a9e101 -> bc10ba570


Move the check for non-null earlier in the method body. It would throw NPE in #checkHierarchyChange() otherwise.

Use Args.


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

Branch: refs/heads/master
Commit: bc10ba570fd6ef9867351d7f7d9e960eb2ba3dfc
Parents: 0b78d75
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Jan 17 11:19:09 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Jan 17 11:19:09 2013 +0200

----------------------------------------------------------------------
 .../java/org/apache/wicket/MarkupContainer.java    |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/bc10ba57/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
index bd6415c..731065c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -710,12 +710,9 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
 	 */
 	public MarkupContainer replace(final Component child)
 	{
-		checkHierarchyChange(child);
+		Args.notNull(child, "child");
 
-		if (child == null)
-		{
-			throw new IllegalArgumentException("argument child must be not null");
-		}
+		checkHierarchyChange(child);
 
 		if (log.isDebugEnabled())
 		{