From 74f2a551c0810b101e71b903d49e05f9285c47e9 Mon Sep 17 00:00:00 2001
From: Srinivasan Ramasubramanian <srini@bigswitch.com>
Date: Mon, 1 Oct 2012 23:34:56 -0700
Subject: [PATCH] Fix a null pointer exception. Add rest routable in link
discovery only if the restApi is not null.
---
.../linkdiscovery/internal/LinkDiscoveryManager.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
index 92481df32..c5230cb09 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
@@ -1875,7 +1875,8 @@ IFloodlightModule, IInfoProvider, IHAListener {
floodlightProvider.addOFSwitchListener(this);
floodlightProvider.addHAListener(this);
floodlightProvider.addInfoProvider("summary", this);
- restApi.addRestletRoutable(new LinkDiscoveryWebRoutable());
+ if (restApi != null)
+ restApi.addRestletRoutable(new LinkDiscoveryWebRoutable());
setControllerTLV();
}
--
GitLab