[sling-org-apache-sling-installer-factory-configuration] branch master updated: SLING-7735 mark configuration resources as "INSTALLED" even in case when the configuration is already active in the system (and doesn't need to be touched)

[kwin]

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git


The following commit(s) were added to refs/heads/master by this push:
     new 0df0650  SLING-7735 mark configuration resources as "INSTALLED" even 
in case when the configuration is already active in the system (and doesn't 
need to be touched)
0df0650 is described below

commit 0df065077af77f07955f9420158b008d73ce5ed3
Author: Konrad Windszus <k...@apache.org>
AuthorDate: Wed Jun 27 13:37:05 2018 +0200

    SLING-7735 mark configuration resources as "INSTALLED" even in case when
    the configuration is already active in the system (and doesn't need to
    be touched)
---
 .../installer/factories/configuration/impl/ConfigInstallTask.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigInstallTask.java
 
b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigInstallTask.java
index 1e397d7..12527ba 100644
--- 
a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigInstallTask.java
+++ 
b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigInstallTask.java
@@ -80,12 +80,12 @@ public class ConfigInstallTask extends AbstractConfigTask {
                     this.getLogger().debug("Configuration " + config.getPid()
                                 + " " + (created ? "created" : "updated")
                                 + " from " + getResource());
-                    this.setFinishedState(ResourceState.INSTALLED, 
this.getCompositeAliasPid());
                     final Operation op = new 
Coordinator.Operation(config.getPid(), config.getFactoryPid(), false);
                     Coordinator.SHARED.add(op);
-                } else {
-                    this.setFinishedState(ResourceState.IGNORED, 
this.getCompositeAliasPid());
                 }
+                // in any case set the state to "INSTALLED" 
+                // (it doesn't matter if the configuration hasn't been updated 
as it has been in the correct state already)
+                this.setFinishedState(ResourceState.INSTALLED, 
this.getCompositeAliasPid());
             } catch (Exception e) {
                 this.getLogger().debug("Exception during installation of 
config " + this.getResource() + " : " + e.getMessage() + ". Retrying later.", 
e);
             }