X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fprotocol_plugins%2Fopenflow%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fprotocol_plugin%2Fopenflow%2Finternal%2FTopologyServiceShim.java;h=424af8d4f445e2e7b214e7533b2141c211dde2d7;hb=752d1c2dd164f5789a9197b3718dc790c02fec73;hp=a811f6529e99546300b9809e9fdb95aa667d9ddb;hpb=4a5b8b61c06c7091a7de5ed9df7456fa325dd909;p=controller.git

diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java
index a811f6529e..424af8d4f4 100644
--- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java
+++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java
@@ -9,7 +9,6 @@
 package org.opendaylight.controller.protocol_plugin.openflow.internal;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -104,12 +103,12 @@ public class TopologyServiceShim implements IDiscoveryService,
 
                     entry = null;
                 } catch (InterruptedException e1) {
-                    logger.warn("TopologyNotify interrupted", e1.getMessage());
+                    logger.warn("TopologyNotify interrupted {}", e1.getMessage());
                     if (shuttingDown) {
                         return;
                     }
                 } catch (Exception e2) {
-                    e2.printStackTrace();
+                    logger.error("",e2);
                 }
             }
         }
@@ -156,13 +155,13 @@ public class TopologyServiceShim implements IDiscoveryService,
                     }
                 } catch (InterruptedException e1) {
                     logger.warn(
-                            "Edge Bandwidth Utilization Notify Thread interrupted",
+                            "Edge Bandwidth Utilization Notify Thread interrupted {}",
                             e1.getMessage());
                     if (shuttingDown) {
                         return;
                     }
                 } catch (Exception e2) {
-                    e2.printStackTrace();
+                    logger.error("",e2);
                 }
             }
         }
@@ -329,8 +328,8 @@ public class TopologyServiceShim implements IDiscoveryService,
                 && !this.topologyServiceShimListeners
                         .containsKey(containerName)) {
             this.topologyServiceShimListeners.put(containerName, s);
-            logger.trace("Added topologyServiceShimListener for container:"
-                    + containerName);
+            logger.trace("Added topologyServiceShimListener for container: {}",
+                    containerName);
         }
     }
 
@@ -350,8 +349,8 @@ public class TopologyServiceShim implements IDiscoveryService,
                 && this.topologyServiceShimListeners.get(containerName).equals(
                         s)) {
             this.topologyServiceShimListeners.remove(containerName);
-            logger.trace("Removed topologyServiceShimListener for container: "
-                    + containerName);
+            logger.trace("Removed topologyServiceShimListener for container: {}",
+                    containerName);
         }
     }
 
@@ -423,14 +422,15 @@ public class TopologyServiceShim implements IDiscoveryService,
             }
             break;
         default:
-            logger.debug("Invalid " + type + " Edge " + edge
-                    + " in container {}", container);
+            logger.debug("notifyEdge: invalid {} for Edge {} in container {}",
+                    type, edge, container);
             return;
         }
 
         notifyQ.add(new NotifyEntry(container, edgeProps, type));
 
-        logger.trace(type + " Edge " + edge + " in container {}", container);
+        logger.debug("notifyEdge: {} Edge {} in container {}",
+                type, edge, container);
     }
 
     @Override