commit f5712ffbd7d5fbb7a28853d6647bb67a4a672982
author Yuta HIGUCHI <y-higuchi@onlab.us> Sat Sep 27 23:52:37 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Mon Sep 29 00:29:06 2014 -0700
tree 257cdbb881c260c92cd938bf786afae408135fcd
parent cb43d60c789a44c7f1aed7e7281d69ebb52a204c

Simple{Device,Link}Store test

Change-Id: I2463248be1ba9d4640e5e9d5110825c747e9094c

core/store/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceStore.java

diff --git a/core/store/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceStore.java b/core/store/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceStore.java
index 15dba06..7c7d38f 100644
--- a/core/store/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceStore.java
+++ b/core/store/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceStore.java
@@ -101,9 +101,6 @@
         synchronized (this) {
             devices.put(deviceId, device);
             availableDevices.add(deviceId);
-
-            // For now claim the device as a master automatically.
-            // roles.put(deviceId, MastershipRole.MASTER);
         }
         return new DeviceEvent(DeviceEvent.Type.DEVICE_ADDED, device, null);
     }
@@ -189,7 +186,7 @@
                     new DefaultPort(device, portDescription.portNumber(),
                                     portDescription.isEnabled());
             ports.put(port.number(), updatedPort);
-            return new DeviceEvent(PORT_UPDATED, device, port);
+            return new DeviceEvent(PORT_UPDATED, device, updatedPort);
         }
         return null;
     }