From: Giovanni Meo <gmeo@cisco.com>
Date: Sun, 22 Sep 2013 13:38:07 +0000 (+0000)
Subject: Merge "Removing the Container Aware dependency from Clustering Services."
X-Git-Tag: releasepom-0.1.0~38
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=312dabba7b74f8d0e78ef698a01866095eca912d;hp=-c

Merge "Removing the Container Aware dependency from Clustering Services."
---

312dabba7b74f8d0e78ef698a01866095eca912d
diff --combined opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java
index d67ee94b62,c897e9a954..c9190af03a
--- a/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java
+++ b/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java
@@@ -291,10 -291,10 +291,10 @@@ public class ContainerManager extends A
              for (Match match : conf.getMatches()) {
                  ContainerFlow cFlow = new ContainerFlow(match);
                  if (delete) {
 -                    logger.trace("Removing Flow Spec %s from Container {}", conf.getName(), containerName);
 +                    logger.trace("Removing Flow Spec {} from Container {}", conf.getName(), containerName);
                      container.deleteFlowSpec(cFlow);
                  } else {
 -                    logger.trace("Adding Flow Spec %s to Container {}", conf.getName(), containerName);
 +                    logger.trace("Adding Flow Spec {} to Container {}", conf.getName(), containerName);
                      container.addFlowSpec(cFlow);
  
                  }
@@@ -1182,6 -1182,7 +1182,7 @@@
              }
          }
  
+         if (delete) clusterServices.removeContainerCaches(containerName);
          return status;
      }