From 989f5d03f392258cdf02349b9e009b7850f7c0e7 Mon Sep 17 00:00:00 2001
From: Rob Adams <rob.adams@bigswitch.com>
Date: Tue, 7 Aug 2012 14:04:43 -0700
Subject: [PATCH] Don't hard-depend on topology for unit tests
---
.../devicemanager/internal/DeviceManagerImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
index b0692e023..3d65f22d1 100755
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
@@ -651,7 +651,8 @@ IFlowReconcileListener, IInfoProvider, IHAListener {
floodlightProvider.addOFMessageListener(OFType.PACKET_IN, this);
floodlightProvider.addHAListener(this);
- topology.addListener(this);
+ if (topology != null)
+ topology.addListener(this);
flowReconcileMgr.addFlowReconcileListener(this);
entityClassifier.addListener(this);
--
GitLab