commit f5f4094291b177ac031f1cccb71603def3cb177a
author Jordan Halterman <jordan@opennetworking.org> Tue Jan 09 13:02:45 2018 -0800
committer Jordan Halterman <jordan@opennetworking.org> Thu Jan 11 00:26:52 2018 +0000
tree 07c61e92e57a697168e432085f2b587d4ccaf1ed
parent 151af4b312787de0bf8c7da29c77790f44e6e420

[ONOS-7352] Activate applications locally when restoring old version after upgrade failure

Change-Id: I9eeff0fc6dbfa6b82c074a0e3a8ca1b4e0fa1227

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 a2c652a..ffda6f5 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
@@ -197,7 +197,7 @@
      * Upgrades application versions for existing applications that are stored on disk after an upgrade.
      */
     private void upgradeExistingApplications() {
-        if (upgradeService.isUpgrading() && upgradeService.isLocalUpgraded()) {
+        if (upgradeService.isUpgrading() && (upgradeService.isLocalActive() || upgradeService.isLocalUpgraded())) {
             getApplicationNames().forEach(appName -> {
                 // Only update the application version if the application has already been installed.
                 ApplicationId appId = getId(appName);