Remove meaningless identity check, fix typo in error message and remove a check for null when it is known to not be null.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8f998ce6 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8f998ce6 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8f998ce6 Branch: refs/heads/master Commit: 8f998ce6a8003b9fd29c016b1eb682c569e2dee6 Parents: 91c5ab1 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Mar 6 10:02:23 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Mar 6 10:02:23 2014 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/MarkupContainer.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/8f998ce6/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 d588112..ddf89ca 100644 --- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java @@ -666,7 +666,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp // Check for required open tag name ComponentTag associatedMarkupOpenTag = (ComponentTag)elem; - if (!((associatedMarkupOpenTag != null) && associatedMarkupOpenTag.isOpen() && (associatedMarkupOpenTag instanceof WicketTag))) + if (!(associatedMarkupOpenTag.isOpen() && (associatedMarkupOpenTag instanceof WicketTag))) { associatedMarkupStream.throwMarkupException(exceptionMessage); } @@ -1055,13 +1055,9 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp if (index != 0) { throw new ArrayIndexOutOfBoundsException("index " + index + - " is greater then 0"); + " is greater than 0"); } component = children; - if (children != component) - { - children = component; - } } else {
