Added protection against redundant feature repo & feature operations.

Change-Id: Idca031e811a659a68ac55080acdef074fcfa80e1

@@ -170,21 +170,24 @@ public class ApplicationManager implements ApplicationService, ApplicationAdminS
             Application app = event.subject();
             Application app = event.subject();
             try {
             try {
                 if (type == APP_ACTIVATED) {
                 if (type == APP_ACTIVATED) {
-                    installAppFeatures(app);
+                    if (installAppFeatures(app)) {
                         log.info("Application {} has been activated", app.id().name());
                         log.info("Application {} has been activated", app.id().name());
+                    }
 
 
                 } else if (type == APP_DEACTIVATED) {
                 } else if (type == APP_DEACTIVATED) {
-                    uninstallAppFeatures(app);
+                    if (uninstallAppFeatures(app)) {
                         log.info("Application {} has been deactivated", app.id().name());
                         log.info("Application {} has been deactivated", app.id().name());
+                    }
 
 
                 } else if (type == APP_INSTALLED) {
                 } else if (type == APP_INSTALLED) {
-                    installAppArtifacts(app);
+                    if (installAppArtifacts(app)) {
                         log.info("Application {} has been installed", app.id().name());
                         log.info("Application {} has been installed", app.id().name());
+                    }
 
 
                 } else if (type == APP_UNINSTALLED) {
                 } else if (type == APP_UNINSTALLED) {
-                    uninstallAppFeatures(app);
-                    uninstallAppArtifacts(app);
+                    if (uninstallAppFeatures(app) || uninstallAppArtifacts(app)) {
                         log.info("Application {} has been uninstalled", app.id().name());
                         log.info("Application {} has been uninstalled", app.id().name());
+                    }
 
 
                 }
                 }
                 eventDispatcher.post(event);
                 eventDispatcher.post(event);
@@ -198,40 +201,52 @@ public class ApplicationManager implements ApplicationService, ApplicationAdminS
     // The following methods are fully synchronized to guard against remote vs.
     // The following methods are fully synchronized to guard against remote vs.
     // locally induced feature service interactions.
     // locally induced feature service interactions.
 
 
-    private synchronized void installAppArtifacts(Application app) throws Exception {
-        if (app.featuresRepo().isPresent()) {
+    private synchronized boolean installAppArtifacts(Application app) throws Exception {
+        if (app.featuresRepo().isPresent() &&
+                featuresService.getRepository(app.featuresRepo().get()) == null) {
             featuresService.addRepository(app.featuresRepo().get());
             featuresService.addRepository(app.featuresRepo().get());
+            return true;
         }
         }
+        return false;
     }
     }
 
 
-    private synchronized void uninstallAppArtifacts(Application app) throws Exception {
-        if (app.featuresRepo().isPresent()) {
+    private synchronized boolean uninstallAppArtifacts(Application app) throws Exception {
+        if (app.featuresRepo().isPresent() &&
+                featuresService.getRepository(app.featuresRepo().get()) != null) {
             featuresService.removeRepository(app.featuresRepo().get());
             featuresService.removeRepository(app.featuresRepo().get());
+            return true;
         }
         }
+        return false;
     }
     }
 
 
-    private synchronized void installAppFeatures(Application app) throws Exception {
+    private synchronized boolean installAppFeatures(Application app) throws Exception {
+        boolean changed = false;
         for (String name : app.features()) {
         for (String name : app.features()) {
             Feature feature = featuresService.getFeature(name);
             Feature feature = featuresService.getFeature(name);
             if (feature != null && !featuresService.isInstalled(feature)) {
             if (feature != null && !featuresService.isInstalled(feature)) {
                 featuresService.installFeature(name);
                 featuresService.installFeature(name);
+                changed = true;
             } else if (feature == null && !initializing) {
             } else if (feature == null && !initializing) {
                 // Suppress feature-not-found reporting during startup since these
                 // Suppress feature-not-found reporting during startup since these
                 // can arise naturally from the staggered cluster install.
                 // can arise naturally from the staggered cluster install.
                 log.warn("Feature {} not found", name);
                 log.warn("Feature {} not found", name);
             }
             }
         }
         }
+        return changed;
     }
     }
 
 
-    private synchronized void uninstallAppFeatures(Application app) throws Exception {
+    private synchronized boolean uninstallAppFeatures(Application app) throws Exception {
+        boolean changed = false;
         for (String name : app.features()) {
         for (String name : app.features()) {
             Feature feature = featuresService.getFeature(name);
             Feature feature = featuresService.getFeature(name);
             if (feature != null && featuresService.isInstalled(feature)) {
             if (feature != null && featuresService.isInstalled(feature)) {
                 featuresService.uninstallFeature(name);
                 featuresService.uninstallFeature(name);
+                changed = true;
             } else if (feature == null) {
             } else if (feature == null) {
                 log.warn("Feature {} not found", name);
                 log.warn("Feature {} not found", name);
             }
             }
         }
         }
+        return changed;
     }
     }
 
 
 }
 }