ONOS-1418 Fix for intermittent issue with app store.

Change-Id: I94cb818550825984ec5e70a82a772a6f3bae5b0d

@@ -346,7 +346,7 @@ public class ApplicationArchive
      * @param appName application name
      * @param appName application name
      * @return true if the app descriptor was updated
      * @return true if the app descriptor was updated
      */
      */
-    private boolean updateTime(String appName) {
+    protected boolean updateTime(String appName) {
         return appFile(appName, APP_XML).setLastModified(System.currentTimeMillis());
         return appFile(appName, APP_XML).setLastModified(System.currentTimeMillis());
     }
     }
 
 

@@ -172,9 +172,9 @@ public class GossipApplicationStore extends ApplicationArchive
      */
      */
     private void loadFromDisk() {
     private void loadFromDisk() {
         for (String name : getApplicationNames()) {
         for (String name : getApplicationNames()) {
-            Application app = create(getApplicationDescription(name));
+            Application app = create(getApplicationDescription(name), false);
             if (app != null && isActive(app.id().name())) {
             if (app != null && isActive(app.id().name())) {
-                activate(app.id());
+                activate(app.id(), false);
                 // load app permissions
                 // load app permissions
             }
             }
         }
         }
@@ -224,11 +224,14 @@ public class GossipApplicationStore extends ApplicationArchive
     @Override
     @Override
     public Application create(InputStream appDescStream) {
     public Application create(InputStream appDescStream) {
         ApplicationDescription appDesc = saveApplication(appDescStream);
         ApplicationDescription appDesc = saveApplication(appDescStream);
-        return create(appDesc);
+        return create(appDesc, true);
     }
     }
 
 
-    private Application create(ApplicationDescription appDesc) {
+    private Application create(ApplicationDescription appDesc, boolean updateTime) {
         Application app = registerApp(appDesc);
         Application app = registerApp(appDesc);
+        if (updateTime) {
+            updateTime(app.id().name());
+        }
         apps.put(app.id(), app);
         apps.put(app.id(), app);
         states.put(app, INSTALLED);
         states.put(app, INSTALLED);
         return app;
         return app;
@@ -246,8 +249,15 @@ public class GossipApplicationStore extends ApplicationArchive
 
 
     @Override
     @Override
     public void activate(ApplicationId appId) {
     public void activate(ApplicationId appId) {
+        activate(appId, true);
+    }
+
+    private void activate(ApplicationId appId, boolean updateTime) {
         Application app = apps.get(appId);
         Application app = apps.get(appId);
         if (app != null) {
         if (app != null) {
+            if (updateTime) {
+                updateTime(appId.name());
+            }
             states.put(app, ACTIVATED);
             states.put(app, ACTIVATED);
         }
         }
     }
     }
@@ -256,6 +266,7 @@ public class GossipApplicationStore extends ApplicationArchive
     public void deactivate(ApplicationId appId) {
     public void deactivate(ApplicationId appId) {
         Application app = apps.get(appId);
         Application app = apps.get(appId);
         if (app != null) {
         if (app != null) {
+            updateTime(appId.name());
             states.put(app, DEACTIVATED);
             states.put(app, DEACTIVATED);
         }
         }
     }
     }