From 5bf9794ce48bb197ad851032e6b31755a93a7e1c Mon Sep 17 00:00:00 2001
From: Ryan Izard <rizard@g.clemson.edu>
Date: Fri, 29 Apr 2016 18:38:19 -0400
Subject: [PATCH] Supposed to use AND, not OR
---
.../java/net/floodlightcontroller/forwarding/Forwarding.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java b/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java
index 231926c8c..9552487f7 100644
--- a/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java
+++ b/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java
@@ -609,7 +609,7 @@ public class Forwarding extends ForwardingBase implements IFloodlightModule, IOF
u.getOperation() == UpdateOperation.TUNNEL_PORT_REMOVED) {
Set<OFMessage> msgs = new HashSet<OFMessage>();
- if (u.getSrc() != null || !u.getSrc().equals(DatapathId.NONE)) {
+ if (u.getSrc() != null && !u.getSrc().equals(DatapathId.NONE)) {
IOFSwitch srcSw = switchService.getSwitch(u.getSrc());
/* src side of link */
if (srcSw != null) {
@@ -631,7 +631,7 @@ public class Forwarding extends ForwardingBase implements IFloodlightModule, IOF
}
/* must be a link, not just a port down, if we have a dst switch */
- if (u.getDst() != null || !u.getDst().equals(DatapathId.NONE)) {
+ if (u.getDst() != null && !u.getDst().equals(DatapathId.NONE)) {
/* dst side of link */
IOFSwitch dstSw = switchService.getSwitch(u.getDst());
if (dstSw != null) {
--
GitLab