commit b473b9dd2d776774c75c98d355438acd6c3708f9
author Marc De Leenheer <marc@onlab.us> Fri Feb 06 15:21:03 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Tue Feb 17 23:55:59 2015 +0000
tree d5a5ba496dde50d7c50208f46d35cd6ea5da720b
parent a66a05635cd68430c4f4cfc7ee302ece74f9e5fe

Injecting topology through JSON ConfigProvider works for multi-instance (ONOS-490).

Change-Id: Ib977f4cf9a59ddec360072891fd803c6f9ee84f1

Injecting optical device annotations and ports works for multi-instance (ONOS-870).

Change-Id: Icdde16ef72fc4e47eec7213250b04902083f0537

apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java

diff --git a/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java b/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java
index fc33693..13796f9 100644
--- a/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java
+++ b/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java
@@ -179,7 +179,7 @@
 
             if (!IntentState.FAILED.equals(intentService.getIntentState(intent.key()))) {
                    return;
-             }
+            }
 
             List<Intent> intents = Lists.newArrayList();
             if (intent instanceof HostToHostIntent) {