| commit | c52ab53d9243a3b1b3b697ea326e7864c6da734f | [log] [tgz] |
|---|---|---|
| author | yoshi <yoshi@onlab.us> | Wed Dec 18 21:35:39 2013 -0800 |
| committer | yoshi <yoshi@onlab.us> | Wed Dec 18 21:35:39 2013 -0800 |
| tree | f6bb7a494f96cb8f948ebe8736e55c95920fae54 | |
| parent | 9dce6e8eb4c7fdbd67c65a80be7f9e06cda513d3 [diff] | |
| parent | d81ce7d90a5a58c3919abd080eccead58bfff128 [diff] |
Merge branch 'RAMCloud' of https://github.com/yoshitomo0912/ONOS into RAMCloud
diff --git a/src/main/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImpl.java b/src/main/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImpl.java index bf6e2e9..e10c705 100644 --- a/src/main/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImpl.java +++ b/src/main/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImpl.java
@@ -116,7 +116,7 @@ private void deleteDeviceOnPort(Long dpid, Short number) { - IPortObject srcPortObject = op.searchPort(HexString.toHexString(dpid), number); + IPortObject srcPortObject = dbop.searchPort(HexString.toHexString(dpid), number); if (srcPortObject.getDevices().iterator().hasNext()) { for (IDeviceObject deviceObject: srcPortObject.getDevices()) { srcPortObject.removeDevice(deviceObject);
diff --git a/src/main/java/net/onrc/onos/ofcontroller/devicemanager/OnosDeviceManager.java b/src/main/java/net/onrc/onos/ofcontroller/devicemanager/OnosDeviceManager.java index f75a2b0..1b14875 100644 --- a/src/main/java/net/onrc/onos/ofcontroller/devicemanager/OnosDeviceManager.java +++ b/src/main/java/net/onrc/onos/ofcontroller/devicemanager/OnosDeviceManager.java
@@ -179,7 +179,7 @@ floodlightProvider = context.getServiceImpl(IFloodlightProviderService.class); deviceStorage = new DeviceStorageImpl(); - deviceStorage.init(""); + deviceStorage.init("",""); } @Override