commit d92b10c9084f58e92efd879b86b3e8b1e03cfcfe
author Yuta HIGUCHI <y-higuchi@onlab.us> Mon Aug 25 09:30:28 2014 -0700
committer Saurav Das <sauravdas@alumni.stanford.edu> Fri Sep 05 11:47:22 2014 -0700
tree 1457b8db3227784e4221d5a7f25f2b0795f6c488
parent a507baf41f38d37a8987d105d181e16f124515a6

Fixing topology related interface/class tree

- (Mutable)Topology no longer implements ImmutableTopology

    --- BaseTopology (was ImmutableTopology)
     |
     +-- ImmutableTopology (new)
     |
     +-- MutableTopology (was Topology)
       |
       +-- RefreshableTopology
       |
       +-- TopologyInternal
            This interface is placed in wrong place. To be fixed later.

Change-Id: Ifa9defcc7c0fc22bba19977fe4ea57eaf792275e

src/main/java/net/onrc/onos/core/packetservice/BroadcastPacketOutNotification.java

diff --git a/src/main/java/net/onrc/onos/core/packetservice/BroadcastPacketOutNotification.java b/src/main/java/net/onrc/onos/core/packetservice/BroadcastPacketOutNotification.java
index 4f96302..f7629d8 100644
--- a/src/main/java/net/onrc/onos/core/packetservice/BroadcastPacketOutNotification.java
+++ b/src/main/java/net/onrc/onos/core/packetservice/BroadcastPacketOutNotification.java
@@ -2,7 +2,7 @@
 
 import java.util.Map;
 
-import net.onrc.onos.core.topology.Topology;
+import net.onrc.onos.core.topology.MutableTopology;
 import net.onrc.onos.core.topology.Port;
 import net.onrc.onos.core.util.Dpid;
 import net.onrc.onos.core.util.PortNumber;
@@ -84,17 +84,17 @@
 
     @Override
     public Multimap<Long, Short> calculateOutPorts(
-            Multimap<Long, Short> localPorts, Topology topology) {
+            Multimap<Long, Short> localPorts, MutableTopology mutableTopology) {
         Multimap<Long, Short> outPorts = HashMultimap.create();
 
         for (Map.Entry<Long, Short> entry : localPorts.entries()) {
             Port globalPort;
-            topology.acquireReadLock();
+            mutableTopology.acquireReadLock();
             try {
-                globalPort = topology.getPort(new Dpid(entry.getKey()),
+                globalPort = mutableTopology.getPort(new Dpid(entry.getKey()),
                     PortNumber.uint16(entry.getValue()));
             } finally {
-                topology.releaseReadLock();
+                mutableTopology.releaseReadLock();
             }
 
             if ((!entry.getKey().equals(inSwitch) ||