From: Madhu Venugopal <mavenugo@gmail.com>
Date: Tue, 20 May 2014 01:42:49 +0000 (+0000)
Subject: Merge "Fix bug 1028: Don't ignore exception in prepareInternalNetwork"
X-Git-Tag: release/helium~186
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=d301d43e63f882ccf8a67b06e10d73687f99cb66;p=ovsdb.git

Merge "Fix bug 1028: Don't ignore exception in prepareInternalNetwork"
---

d301d43e63f882ccf8a67b06e10d73687f99cb66
diff --cc neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
index 8d3126c42,b7148ecb3..5ff7c18f5
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
@@@ -501,12 -486,9 +501,13 @@@ public class InternalNetworkManager imp
              this.createIntegrationBridge(node);
          } catch (Exception e) {
              logger.error("Error creating internal network "+node.toString(), e);
+             return;
          }
 -        ProviderNetworkManager.getManager().initializeFlowRules(node);
 +        if (providerNetworkManager == null) {
 +            logger.error("Error creating internal network. Provider Network Manager unavailable");
 +            return;
 +        }
 +        providerNetworkManager.getProvider().initializeFlowRules(node);
      }
  
      /*