SONAR suggestions - more blocker bugs
- fixed some cases where pointers could be null
- fixed some booleans statements known to always be
true or false
Change-Id: I0d67c1794b37deeccffda1f4ad0f447857e2a5d1
diff --git a/src/main/java/org/onosproject/segmentrouting/LinkHandler.java b/src/main/java/org/onosproject/segmentrouting/LinkHandler.java
index c530439..ef9fb38 100644
--- a/src/main/java/org/onosproject/segmentrouting/LinkHandler.java
+++ b/src/main/java/org/onosproject/segmentrouting/LinkHandler.java
@@ -158,18 +158,20 @@
// However we still need to update ECMP hash groups to include new
// buckets
// for the link that has come up.
- if (!seenBefore && isParallelLink(link)) {
- // if link seen first time, we need to ensure hash-groups have
- // all ports
- log.debug("Attempting retryHash for paralled first-time link {}",
- link);
- groupHandler.retryHash(link, false, true);
- } else {
- // seen before-link
- if (isParallelLink(link)) {
- log.debug("Attempting retryHash for paralled seen-before "
- + "link {}", link);
- groupHandler.retryHash(link, false, false);
+ if (groupHandler != null) {
+ if (!seenBefore && isParallelLink(link)) {
+ // if link seen first time, we need to ensure hash-groups have
+ // all ports
+ log.debug("Attempting retryHash for paralled first-time link {}",
+ link);
+ groupHandler.retryHash(link, false, true);
+ } else {
+ // seen before-link
+ if (isParallelLink(link)) {
+ log.debug("Attempting retryHash for paralled seen-before "
+ + "link {}", link);
+ groupHandler.retryHash(link, false, false);
+ }
}
}
}