summaryrefslogtreecommitdiffstats
path: root/src/com/vaadin
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-08-03 10:26:09 +0300
committerLeif Åstrand <leif@vaadin.com>2012-08-03 10:26:09 +0300
commit406c50ad6cbe537ce709b8958272f93c919e9653 (patch)
tree9d834ff0bfa8f53ab6e64c872711aed19cb74651 /src/com/vaadin
parent0f4bfa8ccd7875a32c3bc283789ffbdbbdd880dd (diff)
downloadvaadin-framework-406c50ad6cbe537ce709b8958272f93c919e9653.tar.gz
vaadin-framework-406c50ad6cbe537ce709b8958272f93c919e9653.zip
Don't warn when same connector resource is used in multiple tabs (#9205)
Diffstat (limited to 'src/com/vaadin')
-rw-r--r--src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index 9a1a2f9c16..ba1b3cadb6 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
@@ -1275,10 +1275,12 @@ public abstract class AbstractCommunicationManager implements Serializable {
// Add to map of names accepted by serveConnectorResource
if (connectorResourceContexts.containsKey(name)) {
Class<?> oldContext = connectorResourceContexts.get(name);
- getLogger().warning(
- "Resource " + name + " defined by both " + context
- + " and " + oldContext + ". Resource from "
- + oldContext + " will be used.");
+ if (oldContext != context) {
+ getLogger().warning(
+ "Resource " + name + " defined by both " + context
+ + " and " + oldContext + ". Resource from "
+ + oldContext + " will be used.");
+ }
} else {
connectorResourceContexts.put(name, context);
}