You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2020/04/27 17:10:32 UTC

[sling-org-apache-sling-installer-core] branch master updated: SLING-9400 : Newly created config which should not be persisted is still written back

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

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


The following commit(s) were added to refs/heads/master by this push:
     new e177de5  SLING-9400 : Newly created config which should not be persisted is still written back
e177de5 is described below

commit e177de5de3c9c5a912bf31bd3b262e4b26051c47
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Apr 27 19:10:21 2020 +0200

    SLING-9400 : Newly created config which should not be persisted is still written back
---
 pom.xml                                                                 | 2 +-
 .../java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4e0cf18..3cdcf79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -245,7 +245,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.13.0</version>
+            <version>3.3.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java b/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
index 646f173..dd3abcf 100644
--- a/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
+++ b/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
@@ -1250,7 +1250,7 @@ implements OsgiInstaller, ResourceChangeListener, RetryHandler, InfoProvider, Ru
                     }
                 }
 
-                if ( !done ) {
+                if ( !done && persistChange) {
                     // create
                     final List<UpdateHandler> handlerList = this.updateHandlerTracker.getSortedServices();
                     for(final UpdateHandler handler : handlerList) {