From: Alessandro Boch <aboch@cisco.com>
Date: Sat, 19 Apr 2014 19:50:05 +0000 (+0000)
Subject: Merge "sal-dom-binding-it is not a bundle but is marked so"
X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~197
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=c8ac0a392258e40d2c8a722179c1a761bd9292ce;hp=cdd013321c53b5b32408b24e0b25cd6a9bfe2980

Merge "sal-dom-binding-it is not a bundle but is marked so"
---

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
index 02a19c156a..1e2aabffe8 100644
--- a/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
@@ -13,7 +13,6 @@
 
   <properties>
     <stax.version>1.0.1</stax.version>
-    <yang.jmx.plugin>0.2.4-SNAPSHOT</yang.jmx.plugin>
     <zeromq.version>0.3.1</zeromq.version>
   </properties>
 
@@ -143,7 +142,7 @@
           <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>yang-jmx-generator-plugin</artifactId>
-            <version>${yang.jmx.plugin}</version>
+            <version>${config.version}</version>
           </dependency>
           <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java
index fc668b3f4d..1a59a325ad 100644
--- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java
+++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java
@@ -148,7 +148,7 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa
                         Thread.sleep(10);
                     }
                 } catch (InterruptedException e1) {
-                    logger.warn("DiscoveryTransmit interupted", e1.getMessage());
+                    logger.trace("DiscoveryTransmit interupted", e1.getMessage());
                     if (shuttingDown) {
                         return;
                     }
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 dacc130831..08ddbde30a 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
@@ -141,7 +141,7 @@ public class TopologyServiceShim implements IDiscoveryListener,
 
                     Thread.sleep(100);
                 } catch (InterruptedException e1) {
-                    logger.warn("TopologyNotify interrupted {}",
+                    logger.trace("TopologyNotify interrupted {}",
                             e1.getMessage());
                     if (shuttingDown) {
                         return;
@@ -200,7 +200,7 @@ public class TopologyServiceShim implements IDiscoveryListener,
                         }
                     }
                 } catch (InterruptedException e1) {
-                    logger.warn(
+                    logger.trace(
                             "Edge Bandwidth Utilization Notify Thread interrupted {}",
                             e1.getMessage());
                     if (shuttingDown) {
@@ -235,10 +235,9 @@ public class TopologyServiceShim implements IDiscoveryListener,
                         logger.debug("Bulk Notify container:{}", containerName);
                         TopologyBulkUpdate(containerName);
                     } catch (InterruptedException e) {
-                        logger.warn("Topology Bulk update thread interrupted");
+                        logger.trace("Topology Bulk update thread interrupted");
                         if (shuttingDown) {
-                            return;
-                        }
+                            return;                        }
                     }
                 }
             }
@@ -265,6 +264,10 @@ public class TopologyServiceShim implements IDiscoveryListener,
     protected void pollTxBitRates() {
         Map<NodeConnector, Pair<Edge, Set<Property>>> globalContainerEdges = edgeMap
                 .get(GlobalConstants.DEFAULT.toString());
+        if (shuttingDown) {
+            logger.trace("Getting out the pollTxBitRates because bundle going down");
+            return;
+        }
         if (globalContainerEdges == null) {
             return;
         }
@@ -357,6 +360,9 @@ public class TopologyServiceShim implements IDiscoveryListener,
         logger.trace("STOP called!");
         shuttingDown = true;
         notifyThread.interrupt();
+        bwUtilNotifyThread.interrupt();
+        ofPluginTopoBulkUpdate.interrupt();
+        pollTimer.cancel();
     }
 
     void setTopologyServiceShimListener(Map<?, ?> props,