commit 6b826f499bf097bf028bc6ce75c0c311c96201c4
author Thomas Vachuska <tom@opennetworking.org> Tue Aug 29 15:21:57 2017 -0700
committer Ray Milkey <ray@opennetworking.org> Tue Aug 29 22:45:36 2017 +0000
tree 1d685386105f14a8ad349a2f8d2162f807ba8ca1
parent 396ea2f34d8fd4698c56db96a1eb314f0ba2d9d0

Fixing issue with app reactivation - temporary fix until ONOS-6977 is addressed.

Change-Id: I13bcb6935839aab1cb09035124edc7d7b293fa41

core/store/dist/src/main/java/org/onosproject/store/app/DistributedApplicationStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/app/DistributedApplicationStore.java b/core/store/dist/src/main/java/org/onosproject/store/app/DistributedApplicationStore.java
index 0931aa8..21450c0 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/app/DistributedApplicationStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/app/DistributedApplicationStore.java
@@ -364,6 +364,7 @@
                     (k, v) -> new InternalApplicationHolder(
                             v.app(), ACTIVATED, v.permissions()));
             appActivationTopic.publish(vAppHolder.value().app());
+            appActivationTopic.publish(null); // FIXME: Once ONOS-6977 is fixed
         }
     }
 
@@ -439,10 +440,12 @@
     private class AppActivator implements Consumer<Application> {
         @Override
         public void accept(Application app) {
-            String appName = app.id().name();
-            installAppIfNeeded(app);
-            setActive(appName);
-            notifyDelegate(new ApplicationEvent(APP_ACTIVATED, app));
+            if (app != null) { // FIXME: Once ONOS-6977 is fixed
+                String appName = app.id().name();
+                installAppIfNeeded(app);
+                setActive(appName);
+                notifyDelegate(new ApplicationEvent(APP_ACTIVATED, app));
+            }
         }
     }