Switch to using ListenerRegistration from yangtools

[bgpcep.git] / bgp / rib-impl / src / main / java / org / opendaylight / protocol / bgp / rib / impl / RIBTables.java

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBTables.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBTables.java
index 6a2a7f211295efa385f470d29652ab04012239f3..8c13e64db61cde8ee345c3950ea0d4cfc3767a39 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBTables.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBTables.java
@@ -1,17 +1,32 @@
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.opendaylight.protocol.bgp.rib.impl;
 
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction;
+import org.opendaylight.protocol.bgp.rib.RibReference;
 import org.opendaylight.protocol.bgp.rib.spi.AdjRIBsIn;
+import org.opendaylight.protocol.bgp.rib.spi.AdjRIBsInFactory;
 import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionConsumerContext;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.PathAttributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.TablesKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Preconditions;
 
 final class RIBTables {
+
+       private static final Logger LOG = LoggerFactory.getLogger(RIBTables.class);
+
        private final Map<TablesKey, AdjRIBsIn> tables = new HashMap<>();
        private final Comparator<PathAttributes> comparator;
        private final RIBExtensionConsumerContext registry;
@@ -22,20 +37,25 @@ final class RIBTables {
        }
 
        public synchronized AdjRIBsIn get(final TablesKey key) {
-               return tables.get(key);
+               return this.tables.get(key);
        }
 
-       public synchronized AdjRIBsIn getOrCreate(final TablesKey key) {
-               final AdjRIBsIn table;
+       public synchronized AdjRIBsIn getOrCreate(final DataModificationTransaction trans, final RibReference rib, final TablesKey key) {
+               LOG.debug("Looking for key {} in tables {}", key, this.tables);
+               if (this.tables.containsKey(key)) {
+                       LOG.trace("Key found {}.", this.tables.get(key));
+                       return this.tables.get(key);
+               }
 
-               if (!tables.containsKey(key)) {
-                       table = registry.getAdjRIBsInFactory(key.getAfi(), key.getSafi()).createAdjRIBsIn(comparator, key);
-                       tables.put(key, table);
-               } else {
-                       table = tables.get(key);
+               final AdjRIBsInFactory f = this.registry.getAdjRIBsInFactory(key.getAfi(), key.getSafi());
+               if (f == null) {
+                       LOG.debug("RIBsInFactory not found for key {}, returning null", key);
+                       return null;
                }
 
+               final AdjRIBsIn table = Preconditions.checkNotNull(f.createAdjRIBsIn(trans, rib, this.comparator, key));
+               LOG.debug("Table {} created for key {}", table, key);
+               this.tables.put(key, table);
                return table;
        }
-
 }