From 406c50ad6cbe537ce709b8958272f93c919e9653 Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Fri, 3 Aug 2012 10:26:09 +0300
Subject: Don't warn when same connector resource is used in multiple tabs
 (#9205)

---
 .../terminal/gwt/server/AbstractCommunicationManager.java      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src')

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);
             }
-- 
cgit v1.2.3