Fixed merge conflicts
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
index 204937b..f67bfea 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
@@ -535,6 +535,7 @@
// add a switch if we have not seen it before
remotesw = remoteSwitches.get(sw);
+
if (remotesw == null) {
remotesw = new OFSwitchImpl();
remotesw.setupRemoteSwitch(sw);
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
index 0e9f32b..249d626 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
@@ -90,7 +90,7 @@
if (currLinks.contains(vportDst)) {
// TODO: update linkinfo
if (op.equals(DM_OPERATION.INSERT) || op.equals(DM_OPERATION.CREATE)) {
- log.debug("addOrUpdateLink(): Failure: link exists {} {} src {} dst {}",
+ log.debug("addOrUpdateLink(): failed link exists {} {} src {} dst {}",
new Object[]{op, lt, vportSrc, vportDst});
}
} else {
@@ -99,14 +99,15 @@
log.debug("addOrUpdateLink(): link added {} {} src {} dst {}", new Object[]{op, lt, vportSrc, vportDst});
}
} else {
- log.error("addOrUpdateLink(): failed {} {} src {} dst {}", new Object[]{op, lt, vportSrc, vportDst});
+ log.error("addOrUpdateLink(): failed invalid vertices {} {} src {} dst {}", new Object[]{op, lt, vportSrc, vportDst});
graph.stopTransaction(Conclusion.FAILURE);
}
} catch (TitanException e) {
/*
* retry till we succeed?
*/
- log.error("addOrUpdateLink(): failed {} {}", new Object[]{op, lt});
+ log.error("addOrUpdateLink(): titan exception {} {} {}", new Object[]{op, lt, e.toString()});
+ e.printStackTrace();
}
}
@@ -151,7 +152,7 @@
count, lt, vportSrc, vportDst});
} else {
- log.error("deleteLink(): failed src port vertex not found {} src {} dst {}", new Object[]{lt, vportSrc, vportDst});
+ log.error("deleteLink(): failed invalid vertices {} src {} dst {}", new Object[]{lt, vportSrc, vportDst});
graph.stopTransaction(Conclusion.FAILURE);
}
@@ -159,7 +160,8 @@
/*
* retry till we succeed?
*/
- log.error("deleteLink(): {} failed", lt);
+ log.error("deleteLink(): titan exception {} {}", new Object[]{lt, e.toString()});
+ e.printStackTrace();
}
}