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 2012/06/08 16:08:46 UTC
git commit: WICKET-4598 Duplicate INFO logs due to twice registered
RequestInterfaceListeners
Updated Branches:
refs/heads/master 272d5885e -> 6293b3a0c
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/6293b3a0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6293b3a0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6293b3a0
Branch: refs/heads/master
Commit: 6293b3a0c346587aefdbf46a26795ceba525f847
Parents: 272d588
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 8 17:08:02 2012 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 8 17:08:02 2012 +0300
----------------------------------------------------------------------
.../apache/wicket/RequestListenerInterface.java | 21 ++++++++------
1 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6293b3a0/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 a3c67bd..c2c313c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
+++ b/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
@@ -316,24 +316,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);
+ }
}
/**