You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/03/09 13:47:59 UTC
svn commit: r1786170 - in
/sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl:
ConfigInstallTask.java ConfigUtil.java
Author: rombert
Date: Thu Mar 9 13:47:59 2017
New Revision: 1786170
URL: http://svn.apache.org/viewvc?rev=1786170&view=rev
Log:
SLING-6313 - Sling installer can duplicate factory configurations if an invalid RegisteredResourceList.ser is found
This reverts r1785938 and this did not bring about any improvements in the upgrade
process.
Modified:
sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigInstallTask.java
sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigUtil.java
Modified: sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigInstallTask.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigInstallTask.java?rev=1786170&r1=1786169&r2=1786170&view=diff
==============================================================================
--- sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigInstallTask.java (original)
+++ sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigInstallTask.java Thu Mar 9 13:47:59 2017
@@ -18,8 +18,6 @@
*/
package org.apache.sling.installer.factories.configuration.impl;
-import java.util.Dictionary;
-
import org.apache.sling.installer.api.tasks.InstallationContext;
import org.apache.sling.installer.api.tasks.ResourceState;
import org.apache.sling.installer.api.tasks.TaskResourceGroup;
@@ -74,11 +72,7 @@ public class ConfigInstallTask extends A
}
if (config != null) {
- Dictionary<String, Object> dictionary = getDictionary();
- if ( this.factoryPid != null && this.configPid != null ) {
- dictionary.put(ConfigUtil.ALIAS_KEY, this.configPid);
- }
- config.update(dictionary);
+ config.update(getDictionary());
ctx.log("Installed configuration {} from resource {}", config.getPid(), getResource());
if ( this.factoryPid != null ) {
this.aliasPid = config.getPid();
Modified: sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigUtil.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigUtil.java?rev=1786170&r1=1786169&r2=1786170&view=diff
==============================================================================
--- sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigUtil.java (original)
+++ sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigUtil.java Thu Mar 9 13:47:59 2017
@@ -48,9 +48,10 @@ abstract class ConfigUtil {
private static final String CONFIG_PATH_KEY = "org.apache.sling.installer.osgi.path";
/**
- * This property is used to keep track of factory configurations.
+ * This property has been used in older versions to keep track of factory
+ * configurations.
*/
- static final String ALIAS_KEY = "org.apache.sling.installer.osgi.factoryaliaspid";
+ private static final String ALIAS_KEY = "org.apache.sling.installer.osgi.factoryaliaspid";
/** Configuration properties to ignore when comparing configs */
private static final Set<String> IGNORED_PROPERTIES = new HashSet<String>();