Merge "BUG-108: defensive AbstractAdjRIBsIn"

diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsIn.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsIn.java
index 51b0291b8b613e2b55c6fd804f55497b5a4c6acb..81845eacccfa232914319748c090c4b1e1976782 100644 (file)
--- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsIn.java
+++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsIn.java
@@ -110,9 +110,6 @@ final class LinkstateAdjRIBsIn extends AbstractAdjRIBsIn<CLinkstateDestination,
                        break;
                }
 
-               if (data == null) {
-                       throw new IllegalStateException("Unhandled link-state NLRI type " + key.getNlriType());
-               }
                super.add(trans, peer, key, data);
        }
 

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractAdjRIBsIn.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractAdjRIBsIn.java
index 6c8013e7d72eb8bcdbd14366541fd9a7d25cc9ad..a9b501830e6dd7c740ad11d77dd5794e8c0f40b9 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractAdjRIBsIn.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractAdjRIBsIn.java
@@ -103,7 +103,7 @@ public abstract class AbstractAdjRIBsIn<ID, DATA extends DataObject> implements
                }
 
                synchronized void setState(final DataModificationTransaction transaction, final Peer peer, final RIBEntryData<ID, DATA> state) {
-                       this.candidates.put(peer, state);
+                       this.candidates.put(Preconditions.checkNotNull(peer), Preconditions.checkNotNull(state));
                        electCandidate(transaction, findCandidate(state));
                }
        }
@@ -133,7 +133,7 @@ public abstract class AbstractAdjRIBsIn<ID, DATA extends DataObject> implements
        protected abstract InstanceIdentifier<?> identifierForKey(final InstanceIdentifier<Tables> basePath, final ID id);
 
        protected synchronized void add(final DataModificationTransaction trans, final Peer peer, final ID id, final RIBEntryData<ID, DATA> data) {
-               RIBEntry e = this.entries.get(id);
+               RIBEntry e = this.entries.get(Preconditions.checkNotNull(id));
                if (e == null) {
                        e = new RIBEntry(id);
                        this.entries.put(id, e);