Minor fix
- Comparing Long with !=
- Long being casted to long
- Cosmetics
Change-Id: I5c5e3519ba438a1b567c9abd21a79449653d07c8
diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java
index 2153905..da4df84 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java
@@ -1,7 +1,6 @@
package net.onrc.onos.ofcontroller.networkgraph;
import java.net.InetAddress;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedList;
@@ -27,7 +26,7 @@
private ConcurrentMap<InetAddress, Set<Device>> addr2Device;
private ConcurrentMap<MACAddress, Device> mac2Device;
-
+
private ReadWriteLock readWriteLock = new ReentrantReadWriteLock();
private Lock readLock = readWriteLock.readLock();
// TODO use the write lock after refactor
@@ -83,9 +82,9 @@
Link link = getLink(srcDpid, srcNumber);
if (link == null)
return null;
- if (link.getDstSwitch().getDpid() != dstDpid)
+ if (!link.getDstSwitch().getDpid().equals(dstDpid))
return null;
- if (link.getDstPort().getNumber() != dstNumber)
+ if (!link.getDstPort().getNumber().equals(dstNumber))
return null;
return link;
}