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

diff --cc neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
index 8d3126c4271a173226b7be97a76da507568316ac,b7148ecb399a5a22ff8223822608ee78e725e7c5..5ff7c18f5e3e52e2bbbdf5341c53e4c011c8f042
--- 1/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
--- 2/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);
      }
  
      /*