Fix for app dependency loading order issue

Change-Id: Ic4210644bb4a7c433c6e4bd6a33136d2bdfe1e5a

Fix for app dependency loading order issue
Change-Id: Ic4210644bb4a7c433c6e4bd6a33136d2bdfe1e5a
Jonathan Hart · Gerrit Code Review
Commit e09b71ab0e8cf7f648f345cfa257f24e62804bf9 e09b71ab 1 parent 53bdcbf9
Showing 1 changed file with 8 additions and 9 deletions
core/store/dist/src/main/java/org/onosproject/store/app/DistributedApplicationStore.java
--- a/core/store/dist/src/main/java/org/onosproject/store/app/DistributedApplicationStore.java
View file @e09b71a
+++ b/core/store/dist/src/main/java/org/onosproject/store/app/DistributedApplicationStore.java
View file @e09b71a
@@ -335,18 +335,17 @@ public class DistributedApplicationStore extends ApplicationArchive
     private void activate(ApplicationId appId, boolean updateTime) {
-        AtomicBoolean stateChanged = new AtomicBoolean(false);
+        Versioned<InternalApplicationHolder> vAppHolder = apps.get(appId);
-        InternalApplicationHolder appHolder = Versioned.valueOrNull(apps.computeIf(appId,
+        if (vAppHolder != null) {
-            v -> v != null && v.state() != ACTIVATED,
-            (k, v) -> {
-                stateChanged.set(true);
-                return new InternalApplicationHolder(v.app(), ACTIVATED, v.permissions());
-            }));
-        if (stateChanged.get()) {
             if (updateTime) {
                 updateTime(appId.name());
             }
-            activateRequiredApps(appHolder.app());
+            activateRequiredApps(vAppHolder.value().app());
+
+            apps.computeIf(appId, v -> v != null && v.state() != ACTIVATED,
+                    (k, v) -> new InternalApplicationHolder(
+                            v.app(), ACTIVATED, v.permissions()));
+
         }
     }