Updated Branches: refs/heads/wicket-1.5.x 8a69ad577 -> 291b85e3a
WICKET-4598 Duplicate INFO logs due to twice registered RequestInterfaceListeners Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/291b85e3 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/291b85e3 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/291b85e3 Branch: refs/heads/wicket-1.5.x Commit: 291b85e3a8b31d1a96e2fc030b0710402ae91957 Parents: 8a69ad5 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Jun 8 17:08:02 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Jun 8 17:09:19 2012 +0300 ---------------------------------------------------------------------- .../apache/wicket/RequestListenerInterface.java | 21 ++++++++------ 1 files changed, 12 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/291b85e3/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java b/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java index 8632470..7b86c17 100644 --- a/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java +++ b/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java @@ -317,24 +317,27 @@ public class RequestListenerInterface * @param requestListenerInterface * The request listener interface object */ - private final void registerRequestListenerInterface( - final RequestListenerInterface requestListenerInterface) + private void registerRequestListenerInterface(final RequestListenerInterface requestListenerInterface) { // Check that a different interface method with the same name has not // already been registered final RequestListenerInterface existingInterface = RequestListenerInterface.forName(requestListenerInterface.getName()); - if (existingInterface != null && - existingInterface.getMethod() != requestListenerInterface.getMethod()) + if (existingInterface != null) { - throw new IllegalStateException("Cannot register listener interface " + + if (existingInterface.getMethod().equals(requestListenerInterface.getMethod()) == false) + { + throw new IllegalStateException("Cannot register listener interface " + requestListenerInterface + " because it conflicts with the already registered interface " + existingInterface); + } } + else + { + // Save this interface method by the non-qualified class name + interfaces.put(requestListenerInterface.getName(), requestListenerInterface); - // Save this interface method by the non-qualified class name - interfaces.put(requestListenerInterface.getName(), requestListenerInterface); - - log.info("registered listener interface " + this); + log.info("registered listener interface " + this); + } } /**
