Merge "Removing the Container Aware dependency from Clustering Services."
authorGiovanni Meo <gmeo@cisco.com>
Sun, 22 Sep 2013 13:38:07 +0000 (13:38 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Sun, 22 Sep 2013 13:38:07 +0000 (13:38 +0000)
1  2 
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);
  
                  }
              }
          }
  
+         if (delete) clusterServices.removeContainerCaches(containerName);
          return status;
      }