From 0807ef51e8395f81e62c8ca8c68d2d20e3a9cdc8 Mon Sep 17 00:00:00 2001
From: Rob Adams <rob.adams@bigswitch.com>
Date: Thu, 10 May 2012 13:54:49 -0700
Subject: [PATCH] Fix null pointer exception
---
.../devicemanager/internal/DeviceManagerImpl.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
index cde8d409d..bcb03086d 100755
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
@@ -243,9 +243,10 @@ public class DeviceManagerImpl implements
if (ts == null)
return 0;
long et = ts.getTime();
- if (topology.
- isBroadcastDomainPort(e.getSwitchDPID(),
- e.getSwitchPort().shortValue())) {
+ Long dpid = e.getSwitchDPID();
+ Integer port = e.getSwitchPort();
+ if (dpid != null && port != null &&
+ topology.isBroadcastDomainPort(dpid, port.shortValue())) {
return et - NBD_TO_BD_TIMEDIFF_MS;
}
return et;
--
GitLab