X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=bgp%2Frib-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fprotocol%2Fbgp%2Frib%2Fimpl%2Fstate%2FBGPStateCollectorImpl.java;fp=bgp%2Frib-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fprotocol%2Fbgp%2Frib%2Fimpl%2Fstate%2FBGPStateCollectorImpl.java;h=c865a08eb42cf6cbf7b4ae6b20babcaee17d4552;hb=b323c783131390fbc70f41db19271ddc1e16cbc5;hp=0937aac4f2e1cb114a4991318e76bdd1cbc0e52f;hpb=524362f9fac7c4c008b1f79c13c329aac39fe941;p=bgpcep.git

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPStateCollectorImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPStateCollectorImpl.java
index 0937aac4f2..c865a08eb4 100644
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPStateCollectorImpl.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPStateCollectorImpl.java
@@ -10,6 +10,7 @@ package org.opendaylight.protocol.bgp.rib.impl.state;
 import com.google.common.collect.ImmutableList;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import javax.annotation.concurrent.GuardedBy;
 import javax.annotation.concurrent.ThreadSafe;
@@ -30,16 +31,22 @@ public class BGPStateCollectorImpl implements BGPStateProvider, BGPStateConsumer
     @Override
     public List<BGPRIBState> getRibStats() {
         synchronized (this.bgpRibStates) {
-            return ImmutableList.copyOf(this.bgpRibStates.stream().map(BGPRIBStateConsumer::getRIBState)
-                .collect(Collectors.toList()));
+            return ImmutableList.copyOf(this.bgpRibStates
+                    .stream()
+                    .map(BGPRIBStateConsumer::getRIBState)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toList()));
         }
     }
 
     @Override
     public List<BGPPeerState> getPeerStats() {
         synchronized (this.bgpPeerStates) {
-            return ImmutableList.copyOf(this.bgpPeerStates.stream().map(BGPPeerStateConsumer::getPeerState)
-                .collect(Collectors.toList()));
+            return ImmutableList.copyOf(this.bgpPeerStates
+                    .stream()
+                    .map(BGPPeerStateConsumer::getPeerState)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toList()));
         }
     }