mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-26 22:01:13 +01:00
Code Issues Projects Releases Wiki Activity

argument should be checked for null before dereferencing

Browse Source 
Change-Id: I3f13d924727a0e522f149d0e1842a730fe7d0e14
This commit is contained in:
Palash Kala 2017-03-30 16:42:23 +09:00
parent 9bf01a1d39
commit a8e1bfa725
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
providers/isis/topology/src/main/java/org/onosproject/provider/isis/topology/impl/IsisTopologyProvider.java
View File

@ -62,6 +62,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.slf4j.LoggerFactory.getLogger; import static org.slf4j.LoggerFactory.getLogger;
/** /**
@ -151,6 +152,7 @@ public class IsisTopologyProvider extends AbstractProvider implements DeviceProv
* @return link description * @return link description
*/ */
private LinkDescription buildLinkDes(IsisLink isisLink) { private LinkDescription buildLinkDes(IsisLink isisLink) {
checkNotNull(isisLink);
long srcAddress = 0; long srcAddress = 0;
long dstAddress = 0; long dstAddress = 0;
boolean localPseduo = false; boolean localPseduo = false;
@ -185,9 +187,8 @@ public class IsisTopologyProvider extends AbstractProvider implements DeviceProv
ConnectPoint src = new ConnectPoint(srcId, PortNumber.portNumber(srcAddress)); ConnectPoint src = new ConnectPoint(srcId, PortNumber.portNumber(srcAddress));
ConnectPoint dst = new ConnectPoint(dstId, PortNumber.portNumber(dstAddress)); ConnectPoint dst = new ConnectPoint(dstId, PortNumber.portNumber(dstAddress));
DefaultAnnotations.Builder annotationBuilder = DefaultAnnotations.builder(); DefaultAnnotations.Builder annotationBuilder = DefaultAnnotations.builder();
if (isisLink != null) {
annotationBuilder = buildAnnotations(annotationBuilder, isisLink); annotationBuilder = buildAnnotations(annotationBuilder, isisLink);
}
return new DefaultLinkDescription(src, dst, Link.Type.DIRECT, false, annotationBuilder.build()); return new DefaultLinkDescription(src, dst, Link.Type.DIRECT, false, annotationBuilder.build());
} }