Merge branch 'master' into topic/netvirtsbmerge

Change-Id: I1b55ec30b080038499f65246ab79716c52984f87
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/internal/Activator.java b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/internal/Activator.java
index 4f0212852d8e0edc1df67a8204cd5dcfb21bb0a5..28714b6a858e537f5149045241ad9044a6fcdc45 100644 (file)
--- a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/internal/Activator.java
+++ b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/internal/Activator.java
@@ -22,8 +22,6 @@ import org.opendaylight.ovsdb.plugin.impl.ConnectionServiceImpl;
 import org.opendaylight.ovsdb.plugin.impl.InventoryServiceImpl;
 
 import org.osgi.framework.BundleContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * OVSDB protocol plugin Activator
@@ -31,8 +29,6 @@ import org.slf4j.LoggerFactory;
  *
  */
 public class Activator extends DependencyActivatorBase {
-    protected static final Logger logger = LoggerFactory
-            .getLogger(Activator.class);
 
     @Override
     public void init(BundleContext context, DependencyManager manager) throws Exception {

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java
index 757ebd02479ff643a628e744b7bd9735a6ee7e77..bb7be5e01b8cb912c97c9d7254a0f0933b5ac90d 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java
@@ -68,8 +68,6 @@ public class OvsdbConnectionInstance implements OvsdbClient {
 
     public void init() {
         if ( this.callback == null) {
-            txInvoker.invoke(new OvsdbNodeCreateCommand(key, null,null));
-            this.callback = new OvsdbMonitorCallback(connectionInfo,txInvoker);
             try {
                 List<String> databases = getDatabases().get();
                 if (databases != null) {
@@ -77,6 +75,13 @@ public class OvsdbConnectionInstance implements OvsdbClient {
                         DatabaseSchema dbSchema = getSchema(database).get();
                         if (dbSchema != null) {
                             transactInvokers.put(dbSchema, new TransactInvokerImpl(this,dbSchema));
+                        }
+                    }
+                    txInvoker.invoke(new OvsdbNodeCreateCommand(key, null,null));
+                    this.callback = new OvsdbMonitorCallback(connectionInfo,txInvoker);
+                    for (String database : databases) {
+                        DatabaseSchema dbSchema = getSchema(database).get();
+                        if (dbSchema != null) {
                             monitorAllTables(database, dbSchema);
                         } else {
                             LOG.warn("No schema reported for database {} for key {}",database,connectionInfo);