Updated Branches: refs/heads/master 6de4d3b40 -> e62ded51a
WICKET-4519 discrepancy between JavaDoc and code in MarkupContainer#visitChildren() Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e62ded51 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e62ded51 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e62ded51 Branch: refs/heads/master Commit: e62ded51a3127d21eea8962f3df824bdabba921d Parents: 6de4d3b Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue May 8 17:42:24 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue May 8 17:42:24 2012 +0300 ---------------------------------------------------------------------- .../apache/wicket/util/visit/ClassVisitFilter.java | 2 +- .../wicket/util/visit/ClassVisitFilterTest.java | 38 +++++++++++++++ 2 files changed, 39 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/e62ded51/wicket-util/src/main/java/org/apache/wicket/util/visit/ClassVisitFilter.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/visit/ClassVisitFilter.java b/wicket-util/src/main/java/org/apache/wicket/util/visit/ClassVisitFilter.java index c94e069..0a7d0b1 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/visit/ClassVisitFilter.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/visit/ClassVisitFilter.java @@ -45,6 +45,6 @@ public class ClassVisitFilter<T> implements IVisitFilter /** {@inheritDoc} */ public boolean visitObject(final Object object) { - return clazz.isAssignableFrom(object.getClass()); + return clazz == null || clazz.isAssignableFrom(object.getClass()); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/e62ded51/wicket-util/src/test/java/org/apache/wicket/util/visit/ClassVisitFilterTest.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/test/java/org/apache/wicket/util/visit/ClassVisitFilterTest.java b/wicket-util/src/test/java/org/apache/wicket/util/visit/ClassVisitFilterTest.java new file mode 100644 index 0000000..b93c5f4 --- /dev/null +++ b/wicket-util/src/test/java/org/apache/wicket/util/visit/ClassVisitFilterTest.java @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.wicket.util.visit; + +import org.junit.Assert; +import org.junit.Test; + +/** + * @since 1.5.7 + */ +public class ClassVisitFilterTest extends Assert +{ + @Test + public void visitObject() throws Exception + { + ClassVisitFilter<String> filter = new ClassVisitFilter<String>(String.class); + assertTrue(filter.visitObject("a string")); + assertFalse(filter.visitObject(123)); + + filter = new ClassVisitFilter<String>(null); + assertTrue(filter.visitObject("a string")); + assertTrue(filter.visitObject(123)); + } +}
