Fix merge miss
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..56fcb91 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);
@@ -136,6 +136,7 @@
deleteDeviceOnPort(link.getSrc(),link.getSrcPort());
deleteDeviceOnPort(link.getDst(),link.getDstPort());
+ long startLinkTime = System.nanoTime();
if (addLinkImpl(link)) {
// Set LinkInfo only if linfo is non-null.
if (linfo != null && (! setLinkInfoImpl(link, linfo))) {
@@ -143,6 +144,8 @@
dbop.rollback();
}
dbop.commit();
+ long endLinkTime = System.nanoTime();
+ log.error("Performance ##add link total time {}", endLinkTime - startLinkTime);
success = true;
} else {
// If we fail here that's because the ports aren't added
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